Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

d3e458d7 · Linus Torvalds <[email protected]> · 2011-03-18 10:46:37 -07:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (308 commits)
  ALSA: sound/pci/asihpi: check adapter index in hpi_ioctl
  ALSA: aloop - Fix possible IRQ lock inversion
  ALSA: sound/core: merge list_del()/list_add_tail() to list_move_tail()
  ALSA: ctxfi - use list_move() instead of list_del()/list_add() combination
  ALSA: firewire - msleep needs delay.h
  ALSA: firewire-lib, firewire-speakers: handle packet queueing errors
  ALSA: firewire-lib: allocate DMA buffer separately
  ALSA: firewire-lib: use no-info SYT for packets without SYT sample
  ALSA: add LaCie FireWire Speakers/Griffin FireWave Surround driver
  ALSA: hda - Remove an unused variable in patch_realtek.c
  ALSA: hda - pin-adc-mux-dmic auto-configuration of 92HD8X codecs
  ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs
  ALSA: hda - Move default input-src selection to init part
  ALSA: hda - Initialize special cases for input src in init phase
  ALSA: ctxfi - Clear input settings before initialization
  ALSA: ctxfi - Fix SPDIF status retrieval
  ALSA: ctxfi - Fix incorrect SPDIF status bit mask
  ALSA: ctxfi - Fix microphone boost codes/comments
  ALSA: atiixp - Fix wrong time-out checks during ac-link reset
  ALSA: intel8x0m: append 'm' to "r_intel8x0"
  ...

Commit: d3e458d78167102cc961237cfceef6fffc80c0b3
Parents: f2e1fbb5 · d351cf46

Merge commit. Changes below are compared with the first parent: f2e1fbb5.

Changes

254 files changed · +27080 −9623

File	Status	Add	Del	Content
arch/arm/mach-shmobile/board-ag5evm.c	modified	+0	−10	View file
arch/arm/mach-shmobile/board-ap4evb.c	modified	+7	−6	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+7	−6	View file
arch/sh/boards/mach-ecovec24/setup.c	modified	+1	−5	View file
arch/sh/boards/mach-se/7724/setup.c	modified	+1	−5	View file
drivers/firewire/core-iso.c	modified	+1	−0	View file
drivers/firewire/core.h	modified	+0	−3	View file
include/linux/firewire.h	modified	+7	−0	View file
include/linux/mfd/wm8994/pdata.h	modified	+10	−2	View file
include/linux/mfd/wm8994/registers.h	modified	+2	−0	View file
include/sound/ac97_codec.h	modified	+5	−0	View file
include/sound/control.h	modified	+2	−0	View file
include/sound/cs4271.h	added	+24	−0	View file
include/sound/hdspm.h	modified	+137	−42	View file
include/sound/mixer_oss.h	modified	+3	−0	View file
include/sound/pcm.h	modified	+46	−45	View file
include/sound/sh_fsi.h	modified	+19	−57	View file
include/sound/soc-dapm.h	modified	+16	−0	View file
include/sound/soc.h	modified	+135	−12	View file
include/sound/tlv320aic32x4.h	added	+31	−0	View file
include/sound/version.h	modified	+1	−1	View file
include/sound/wm8903.h	modified	+19	−1	View file
include/sound/wm9081.h	modified	+6	−3	View file
include/trace/events/asoc.h	modified	+25	−0	View file
sound/Kconfig	modified	+2	−0	View file
sound/Makefile	modified	+1	−1	View file
sound/core/control.c	modified	+56	−12	View file
sound/core/device.c	modified	+4	−3	View file
sound/core/memalloc.c	modified	+2	−1	View file
sound/core/oss/linear.c	modified	+4	−3	View file
sound/core/oss/mixer_oss.c	modified	+6	−4	View file
sound/core/oss/mulaw.c	modified	+1	−1	View file
sound/core/oss/pcm_oss.c	modified	+28	−23	View file
sound/core/oss/pcm_plugin.c	modified	+22	−18	View file
sound/core/oss/pcm_plugin.h	modified	+6	−5	View file
sound/core/oss/route.c	modified	+3	−3	View file
sound/core/pcm.c	modified	+5	−5	View file
sound/core/pcm_misc.c	modified	+19	−16	View file
sound/core/pcm_native.c	modified	+1	−1	View file
sound/core/seq/seq_clientmgr.c	modified	+2	−5	View file
sound/core/seq/seq_memory.c	modified	+3	−3	View file
sound/core/seq/seq_memory.h	modified	+4	−0	View file
sound/core/seq/seq_ports.c	modified	+1	−1	View file
sound/core/timer.c	modified	+3	−5	View file
sound/core/vmaster.c	modified	+1	−1	View file
sound/drivers/aloop.c	modified	+9	−10	View file
sound/firewire/Kconfig	added	+25	−0	View file
sound/firewire/Makefile	added	+6	−0	View file
sound/firewire/amdtp.c	added	+562	−0	View file
sound/firewire/amdtp.h	added	+169	−0	View file
sound/firewire/cmp.c	added	+308	−0	View file
sound/firewire/cmp.h	added	+41	−0	View file
sound/firewire/fcp.c	added	+224	−0	View file
sound/firewire/fcp.h	added	+12	−0	View file
sound/firewire/iso-resources.c	added	+232	−0	View file
sound/firewire/iso-resources.h	added	+39	−0	View file
sound/firewire/lib.c	added	+85	−0	View file
sound/firewire/lib.h	added	+19	−0	View file
sound/firewire/packets-buffer.c	added	+74	−0	View file
sound/firewire/packets-buffer.h	added	+26	−0	View file
sound/firewire/speakers.c	added	+858	−0	View file
sound/oss/soundcard.c	modified	+20	−36	View file
sound/pci/Kconfig	modified	+9	−3	View file
sound/pci/ac97/ac97_codec.c	modified	+56	−34	View file
sound/pci/ac97/ac97_patch.c	modified	+52	−0	View file
sound/pci/asihpi/asihpi.c	modified	+386	−388	View file
sound/pci/asihpi/hpi.h	modified	+448	−766	View file
sound/pci/asihpi/hpi6000.c	modified	+137	−162	View file
sound/pci/asihpi/hpi6205.c	modified	+250	−353	View file
sound/pci/asihpi/hpi6205.h	modified	+2	−5	View file
sound/pci/asihpi/hpi_internal.h	modified	+530	−588	View file
sound/pci/asihpi/hpicmn.c	modified	+265	−215	View file
sound/pci/asihpi/hpicmn.h	modified	+11	−13	View file
sound/pci/asihpi/hpidebug.c	modified	+5	−152	View file
sound/pci/asihpi/hpidebug.h	modified	+20	−303	View file
sound/pci/asihpi/hpidspcd.c	modified	+20	−17	View file
sound/pci/asihpi/hpidspcd.h	modified	+1	−1	View file
sound/pci/asihpi/hpifunc.c	modified	+725	−1773	View file
sound/pci/asihpi/hpimsginit.c	modified	+2	−16	View file
sound/pci/asihpi/hpimsginit.h	modified	+9	−3	View file
sound/pci/asihpi/hpimsgx.c	modified	+51	−152	View file
sound/pci/asihpi/hpioctl.c	modified	+46	−44	View file
sound/pci/asihpi/hpios.h	modified	+4	−6	View file
sound/pci/atiixp.c	modified	+1	−1	View file
sound/pci/atiixp_modem.c	modified	+1	−1	View file
sound/pci/au88x0/au88x0_eq.c	modified	+2	−1	View file
sound/pci/azt3328.c	modified	+402	−48	View file
sound/pci/ctxfi/ctatc.c	modified	+1	−1	View file
sound/pci/ctxfi/ctdaio.c	modified	+2	−0	View file
sound/pci/ctxfi/cthw20k2.c	modified	+18	−10	View file
sound/pci/ctxfi/ctmixer.c	modified	+5	−14	View file
sound/pci/ctxfi/ctvmem.c	modified	+1	−2	View file
sound/pci/emu10k1/emu10k1_main.c	modified	+1	−1	View file
sound/pci/hda/hda_codec.c	modified	+105	−0	View file
sound/pci/hda/hda_codec.h	modified	+5	−0	View file
sound/pci/hda/hda_intel.c	modified	+5	−2	View file
sound/pci/hda/hda_local.h	modified	+24	−0	View file
sound/pci/hda/patch_analog.c	modified	+10	−107	View file
sound/pci/hda/patch_conexant.c	modified	+14	−110	View file
sound/pci/hda/patch_hdmi.c	modified	+13	−9	View file
sound/pci/hda/patch_realtek.c	modified	+80	−126	View file
sound/pci/hda/patch_sigmatel.c	modified	+162	−156	View file
sound/pci/intel8x0m.c	modified	+54	−53	View file
sound/pci/rme9652/hdspm.c	modified	+3352	−1114	View file
sound/ppc/pmac.c	modified	+5	−1	View file
sound/soc/Kconfig	modified	+2	−0	View file
sound/soc/Makefile	modified	+2	−0	View file
sound/soc/codecs/Kconfig	modified	+33	−1	View file
sound/soc/codecs/Makefile	modified	+17	−1	View file
sound/soc/codecs/ak4104.c	modified	+0	−1	View file
sound/soc/codecs/ak4642.c	modified	+24	−0	View file
sound/soc/codecs/cs4270.c	modified	+3	−5	View file
sound/soc/codecs/cs4271.c	added	+667	−0	View file
sound/soc/codecs/dfbmcs320.c	added	+72	−0	View file
sound/soc/codecs/lm4857.c	added	+276	−0	View file
sound/soc/codecs/max98088.c	modified	+1	−1	View file
sound/soc/codecs/max9850.c	added	+389	−0	View file
sound/soc/codecs/max9850.h	added	+38	−0	View file
sound/soc/codecs/sgtl5000.c	added	+1513	−0	View file
sound/soc/codecs/sgtl5000.h	added	+400	−0	View file
sound/soc/codecs/sn95031.c	added	+949	−0	View file
sound/soc/codecs/sn95031.h	added	+132	−0	View file
sound/soc/codecs/tlv320aic32x4.c	added	+794	−0	View file
sound/soc/codecs/tlv320aic32x4.h	added	+143	−0	View file
sound/soc/codecs/tlv320dac33.c	modified	+1	−0	View file
sound/soc/codecs/twl6040.c	modified	+2	−2	View file
sound/soc/codecs/wm2000.c	modified	+7	−7	View file
sound/soc/codecs/wm8523.c	modified	+4	−4	View file
sound/soc/codecs/wm8741.c	modified	+8	−5	View file
sound/soc/codecs/wm8753.c	modified	+121	−175	View file
sound/soc/codecs/wm8804.c	modified	+1	−1	View file
sound/soc/codecs/wm8900.c	modified	+1	−1	View file
sound/soc/codecs/wm8903.c	modified	+459	−182	View file
sound/soc/codecs/wm8903.h	modified	+8	−0	View file
sound/soc/codecs/wm8904.c	modified	+27	−16	View file
sound/soc/codecs/wm8955.c	modified	+19	−8	View file
sound/soc/codecs/wm8961.c	modified	+1	−1	View file
sound/soc/codecs/wm8962.c	modified	+23	−13	View file
sound/soc/codecs/wm8978.c	modified	+4	−3	View file
sound/soc/codecs/wm8991.c	added	+1427	−0	View file
sound/soc/codecs/wm8991.h	added	+833	−0	View file
sound/soc/codecs/wm8993.c	modified	+1	−1	View file
sound/soc/codecs/wm8994-tables.c	modified	+6	−6	View file
sound/soc/codecs/wm8994.c	modified	+65	−62	View file
sound/soc/codecs/wm8994.h	modified	+1	−1	View file
sound/soc/codecs/wm8995.c	modified	+98	−5	View file
sound/soc/codecs/wm9081.c	modified	+37	−47	View file
sound/soc/codecs/wm9090.c	modified	+26	−19	View file
sound/soc/codecs/wm_hubs.c	modified	+2	−1	View file
sound/soc/davinci/davinci-i2s.c	modified	+19	−9	View file
sound/soc/davinci/davinci-mcasp.c	modified	+20	−9	View file
sound/soc/ep93xx/Kconfig	modified	+9	−0	View file
sound/soc/ep93xx/Makefile	modified	+2	−0	View file
sound/soc/ep93xx/edb93xx.c	added	+142	−0	View file
sound/soc/ep93xx/ep93xx-ac97.c	modified	+0	−1	View file
sound/soc/ep93xx/ep93xx-i2s.c	modified	+17	−14	View file
sound/soc/ep93xx/ep93xx-pcm.c	modified	+2	−2	View file
sound/soc/fsl/mpc8610_hpcd.c	modified	+2	−4	View file
sound/soc/fsl/p1022_ds.c	modified	+2	−4	View file
sound/soc/imx/Kconfig	modified	+10	−0	View file
sound/soc/imx/Makefile	modified	+2	−0	View file
sound/soc/imx/imx-ssi.c	modified	+4	−1	View file
sound/soc/imx/mx27vis-aic32x4.c	added	+137	−0	View file
sound/soc/mid-x86/Kconfig	added	+14	−0	View file
sound/soc/mid-x86/Makefile	added	+5	−0	View file
sound/soc/mid-x86/mfld_machine.c	added	+452	−0	View file
sound/soc/mid-x86/sst_platform.c	added	+474	−0	View file
sound/soc/mid-x86/sst_platform.h	added	+63	−0	View file
sound/soc/omap/Kconfig	modified	+1	−0	View file
sound/soc/omap/rx51.c	modified	+123	−8	View file
sound/soc/pxa/raumfeld.c	modified	+10	−10	View file
sound/soc/pxa/tosa.c	modified	+2	−2	View file
sound/soc/pxa/z2.c	modified	+6	−1	View file
sound/soc/pxa/zylonite.c	modified	+4	−5	View file
sound/soc/samsung/Kconfig	modified	+6	−13	View file
sound/soc/samsung/Makefile	modified	+0	−2	View file
sound/soc/samsung/ac97.c	modified	+4	−4	View file
sound/soc/samsung/ac97.h	deleted	+0	−21	View before deletion
sound/soc/samsung/dma.c	modified	+5	−8	View file
sound/soc/samsung/dma.h	modified	+0	−8	View file
sound/soc/samsung/goni_wm8994.c	modified	+1	−9	View file
sound/soc/samsung/h1940_uda1380.c	modified	+0	−9	View file
sound/soc/samsung/i2s.c	modified	+1	−2	View file
sound/soc/samsung/jive_wm8750.c	modified	+0	−11	View file
sound/soc/samsung/lm4857.h	deleted	+0	−32	View before deletion
sound/soc/samsung/ln2440sbc_alc650.c	modified	+0	−7	View file
sound/soc/samsung/neo1973_gta02_wm8753.c	deleted	+0	−504	View before deletion
sound/soc/samsung/neo1973_wm8753.c	modified	+234	−401	View file
sound/soc/samsung/pcm.c	modified	+108	−10	View file
sound/soc/samsung/pcm.h	modified	+0	−107	View file
sound/soc/samsung/rx1950_uda1380.c	modified	+0	−11	View file
sound/soc/samsung/s3c-i2s-v2.c	modified	+1	−2	View file
sound/soc/samsung/s3c2412-i2s.c	modified	+1	−11	View file
sound/soc/samsung/s3c24xx-i2s.c	modified	+1	−13	View file
sound/soc/samsung/s3c24xx_simtec.c	modified	+0	−7	View file
sound/soc/samsung/s3c24xx_simtec_hermes.c	modified	+0	−10	View file
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c	modified	+0	−12	View file
sound/soc/samsung/s3c24xx_uda134x.c	modified	+1	−8	View file
sound/soc/samsung/smartq_wm8987.c	modified	+0	−6	View file
sound/soc/samsung/smdk2443_wm9710.c	modified	+0	−7	View file
sound/soc/samsung/smdk_spdif.c	modified	+0	−5	View file
sound/soc/samsung/smdk_wm8580.c	modified	+1	−6	View file
sound/soc/samsung/smdk_wm9713.c	modified	+0	−5	View file
sound/soc/samsung/spdif.c	modified	+1	−2	View file
sound/soc/sh/fsi-ak4642.c	modified	+20	−4	View file
sound/soc/sh/fsi-da7210.c	modified	+11	−2	View file
sound/soc/sh/fsi-hdmi.c	modified	+72	−5	View file
sound/soc/sh/fsi.c	modified	+114	−89	View file
sound/soc/soc-cache.c	modified	+188	−198	View file
sound/soc/soc-core.c	modified	+372	−176	View file
sound/soc/soc-dapm.c	modified	+172	−85	View file
sound/soc/soc-jack.c	modified	+56	−2	View file
sound/soc/soc-utils.c	modified	+3	−20	View file
sound/soc/tegra/Kconfig	added	+26	−0	View file
sound/soc/tegra/Makefile	added	+15	−0	View file
sound/soc/tegra/harmony.c	added	+393	−0	View file
sound/soc/tegra/tegra_asoc_utils.c	added	+155	−0	View file
sound/soc/tegra/tegra_asoc_utils.h	added	+45	−0	View file
sound/soc/tegra/tegra_das.c	added	+265	−0	View file
sound/soc/tegra/tegra_das.h	added	+135	−0	View file
sound/soc/tegra/tegra_i2s.c	added	+503	−0	View file
sound/soc/tegra/tegra_i2s.h	added	+165	−0	View file
sound/soc/tegra/tegra_pcm.c	added	+404	−0	View file
sound/soc/tegra/tegra_pcm.h	added	+55	−0	View file
sound/sound_core.c	modified	+3	−0	View file
sound/usb/6fire/Makefile	added	+3	−0	View file
sound/usb/6fire/chip.c	added	+232	−0	View file
sound/usb/6fire/chip.h	added	+32	−0	View file
sound/usb/6fire/comm.c	added	+176	−0	View file
sound/usb/6fire/comm.h	added	+44	−0	View file
sound/usb/6fire/common.h	added	+30	−0	View file
sound/usb/6fire/control.c	added	+275	−0	View file
sound/usb/6fire/control.h	added	+37	−0	View file
sound/usb/6fire/firmware.c	added	+426	−0	View file
sound/usb/6fire/firmware.h	added	+27	−0	View file
sound/usb/6fire/midi.c	added	+203	−0	View file
sound/usb/6fire/midi.h	added	+46	−0	View file
sound/usb/6fire/pcm.c	added	+688	−0	View file
sound/usb/6fire/pcm.h	added	+76	−0	View file
sound/usb/Kconfig	modified	+17	−0	View file
sound/usb/Makefile	modified	+1	−1	View file
sound/usb/caiaq/audio.c	modified	+1	−0	View file
sound/usb/caiaq/device.c	modified	+6	−0	View file
sound/usb/caiaq/device.h	modified	+1	−0	View file
sound/usb/card.c	modified	+55	−9	View file
sound/usb/midi.c	modified	+8	−0	View file
sound/usb/mixer.c	modified	+61	−4	View file
sound/usb/mixer.h	modified	+2	−0	View file
sound/usb/mixer_quirks.c	modified	+161	−13	View file
sound/usb/pcm.c	modified	+15	−5	View file
sound/usb/power.h	added	+17	−0	View file
sound/usb/quirks-table.h	modified	+14	−0	View file
sound/usb/quirks.c	modified	+45	−11	View file
sound/usb/usbaudio.h	modified	+5	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/arm/mach-shmobile/board-ag5evm.c

View file

diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 4303a86..3e6f0aa 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -119,13 +119,6 @@ static struct platform_device keysc_device = {
 };
 
 /* FSI A */
-static struct sh_fsi_platform_info fsi_info = {
-	.porta_flags = SH_FSI_OUT_SLAVE_MODE	|
-		       SH_FSI_IN_SLAVE_MODE	|
-		       SH_FSI_OFMT(I2S)		|
-		       SH_FSI_IFMT(I2S),
-};
-
 static struct resource fsi_resources[] = {
 	[0] = {
 		.name	= "FSI",
@@ -144,9 +137,6 @@ static struct platform_device fsi_device = {
 	.id		= -1,
 	.num_resources	= ARRAY_SIZE(fsi_resources),
 	.resource	= fsi_resources,
-	.dev	= {
-		.platform_data	= &fsi_info,
-	},
 };
 
 static struct resource sh_mmcif_resources[] = {

arch/arm/mach-shmobile/board-ap4evb.c

View file

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 81d6536..1a8118c 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -673,16 +673,12 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)
 }
 
 static struct sh_fsi_platform_info fsi_info = {
-	.porta_flags = SH_FSI_BRS_INV |
-		       SH_FSI_OUT_SLAVE_MODE |
-		       SH_FSI_IN_SLAVE_MODE |
-		       SH_FSI_OFMT(PCM) |
-		       SH_FSI_IFMT(PCM),
+	.porta_flags = SH_FSI_BRS_INV,
 
 	.portb_flags = SH_FSI_BRS_INV |
 		       SH_FSI_BRM_INV |
 		       SH_FSI_LRS_INV |
-		       SH_FSI_OFMT(SPDIF),
+		       SH_FSI_FMT_SPDIF,
 	.set_rate = fsi_set_rate,
 };
 
@@ -783,6 +779,10 @@ static struct platform_device hdmi_device = {
 	},
 };
 
+static struct platform_device fsi_hdmi_device = {
+	.name		= "sh_fsi2_b_hdmi",
+};
+
 static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,
 				unsigned long *parent_freq)
 {
@@ -936,6 +936,7 @@ static struct platform_device *ap4evb_devices[] __initdata = {
 	&usb1_host_device,
 	&fsi_device,
 	&fsi_ak4643_device,
+	&fsi_hdmi_device,
 	&sh_mmcif_device,
 	&lcdc1_device,
 	&lcdc_device,

arch/arm/mach-shmobile/board-mackerel.c

View file

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 1657eac..1a63c21 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -399,6 +399,10 @@ static struct platform_device hdmi_device = {
 	},
 };
 
+static struct platform_device fsi_hdmi_device = {
+	.name		= "sh_fsi2_b_hdmi",
+};
+
 static int __init hdmi_init_pm_clock(void)
 {
 	struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");
@@ -609,16 +613,12 @@ fsi_set_rate_end:
 }
 
 static struct sh_fsi_platform_info fsi_info = {
-	.porta_flags =	SH_FSI_BRS_INV		|
-			SH_FSI_OUT_SLAVE_MODE	|
-			SH_FSI_IN_SLAVE_MODE	|
-			SH_FSI_OFMT(PCM)	|
-			SH_FSI_IFMT(PCM),
+	.porta_flags =	SH_FSI_BRS_INV,
 
 	.portb_flags =	SH_FSI_BRS_INV	|
 			SH_FSI_BRM_INV	|
 			SH_FSI_LRS_INV	|
-			SH_FSI_OFMT(SPDIF),
+			SH_FSI_FMT_SPDIF,
 
 	.set_rate = fsi_set_rate,
 };
@@ -921,6 +921,7 @@ static struct platform_device *mackerel_devices[] __initdata = {
 	&leds_device,
 	&fsi_device,
 	&fsi_ak4643_device,
+	&fsi_hdmi_device,
 	&sdhi0_device,
 #if !defined(CONFIG_MMC_SH_MMCIF)
 	&sdhi1_device,

arch/sh/boards/mach-ecovec24/setup.c

View file

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 3b71d21..e44480c 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -725,11 +725,7 @@ static struct platform_device camera_devices[] = {
 
 /* FSI */
 static struct sh_fsi_platform_info fsi_info = {
-	.portb_flags = SH_FSI_BRS_INV |
-		       SH_FSI_OUT_SLAVE_MODE |
-		       SH_FSI_IN_SLAVE_MODE |
-		       SH_FSI_OFMT(I2S) |
-		       SH_FSI_IFMT(I2S),
+	.portb_flags = SH_FSI_BRS_INV,
 };
 
 static struct resource fsi_resources[] = {

arch/sh/boards/mach-se/7724/setup.c

View file

diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 5276793..c8bcf6a 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -286,11 +286,7 @@ static struct platform_device ceu1_device = {
 /* FSI */
 /* change J20, J21, J22 pin to 1-2 connection to use slave mode */
 static struct sh_fsi_platform_info fsi_info = {
-	.porta_flags = SH_FSI_BRS_INV |
-		       SH_FSI_OUT_SLAVE_MODE |
-		       SH_FSI_IN_SLAVE_MODE |
-		       SH_FSI_OFMT(PCM) |
-		       SH_FSI_IFMT(PCM),
+	.porta_flags = SH_FSI_BRS_INV,
 };
 
 static struct resource fsi_resources[] = {

drivers/firewire/core-iso.c

View file

diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c
index c003fa4..c865888 100644
--- a/drivers/firewire/core-iso.c
+++ b/drivers/firewire/core-iso.c
@@ -362,3 +362,4 @@ void fw_iso_resource_manage(struct fw_card *card, int generation,
 		*channel = ret;
 	}
 }
+EXPORT_SYMBOL(fw_iso_resource_manage);

drivers/firewire/core.h

View file

diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
index f8dfcf1..25e729c 100644
--- a/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
@@ -147,9 +147,6 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event);
 /* -iso */
 
 int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma);
-void fw_iso_resource_manage(struct fw_card *card, int generation,
-			    u64 channels_mask, int *channel, int *bandwidth,
-			    bool allocate, __be32 buffer[2]);
 
 
 /* -topology */

include/linux/firewire.h

View file

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 9a3f5f9..fc023d6 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -42,6 +42,10 @@
 #define CSR_BROADCAST_CHANNEL		0x234
 #define CSR_CONFIG_ROM			0x400
 #define CSR_CONFIG_ROM_END		0x800
+#define CSR_OMPR			0x900
+#define CSR_OPCR(i)			(0x904 + (i) * 4)
+#define CSR_IMPR			0x980
+#define CSR_IPCR(i)			(0x984 + (i) * 4)
 #define CSR_FCP_COMMAND			0xB00
 #define CSR_FCP_RESPONSE		0xD00
 #define CSR_FCP_END			0xF00
@@ -441,5 +445,8 @@ int fw_iso_context_start(struct fw_iso_context *ctx,
 			 int cycle, int sync, int tags);
 int fw_iso_context_stop(struct fw_iso_context *ctx);
 void fw_iso_context_destroy(struct fw_iso_context *ctx);
+void fw_iso_resource_manage(struct fw_card *card, int generation,
+			    u64 channels_mask, int *channel, int *bandwidth,
+			    bool allocate, __be32 buffer[2]);
 
 #endif /* _LINUX_FIREWIRE_H */

include/linux/mfd/wm8994/pdata.h

View file

diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 9eab263..466b1c7 100644
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -103,13 +103,21 @@ struct wm8994_pdata {
         unsigned int lineout1fb:1;
         unsigned int lineout2fb:1;
 
-        /* Microphone biases: 0=0.9*AVDD1 1=0.65*AVVD1 */
+	/* IRQ for microphone detection if brought out directly as a
+	 * signal.
+	 */
+	int micdet_irq;
+
+        /* WM8994 microphone biases: 0=0.9*AVDD1 1=0.65*AVVD1 */
         unsigned int micbias1_lvl:1;
         unsigned int micbias2_lvl:1;
 
-        /* Jack detect threashold levels, see datasheet for values */
+        /* WM8994 jack detect threashold levels, see datasheet for values */
         unsigned int jd_scthr:2;
         unsigned int jd_thr:2;
+
+	/* WM8958 microphone bias configuration */
+	int micbias[2];
 };
 
 #endif

include/linux/mfd/wm8994/registers.h

View file

diff --git a/include/linux/mfd/wm8994/registers.h b/include/linux/mfd/wm8994/registers.h
index be072fa..f3ee842 100644
--- a/include/linux/mfd/wm8994/registers.h
+++ b/include/linux/mfd/wm8994/registers.h
@@ -63,6 +63,8 @@
 #define WM8994_MICBIAS                          0x3A
 #define WM8994_LDO_1                            0x3B
 #define WM8994_LDO_2                            0x3C
+#define WM8958_MICBIAS1				0x3D
+#define WM8958_MICBIAS2				0x3E
 #define WM8994_CHARGE_PUMP_1                    0x4C
 #define WM8958_CHARGE_PUMP_2                    0x4D
 #define WM8994_CLASS_W_1                        0x51

include/sound/ac97_codec.h

View file

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index b602f47..f1dcefe 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -96,6 +96,10 @@
 #define AC97_FUNC_INFO		0x68	/* Function Information */
 #define AC97_SENSE_INFO		0x6a	/* Sense Details */
 
+/* volume controls */
+#define AC97_MUTE_MASK_MONO	0x8000
+#define AC97_MUTE_MASK_STEREO	0x8080
+
 /* slot allocation */
 #define AC97_SLOT_TAG		0
 #define AC97_SLOT_CMD_ADDR	1
@@ -138,6 +142,7 @@
 #define AC97_BC_18BIT_ADC	0x0100	/* 18-bit ADC resolution */
 #define AC97_BC_20BIT_ADC	0x0200	/* 20-bit ADC resolution */
 #define AC97_BC_ADC_MASK	0x0300
+#define AC97_BC_3D_TECH_ID_MASK	0x7c00	/* Per-vendor ID of 3D enhancement */
 
 /* general purpose */
 #define AC97_GP_DRSS_MASK	0x0c00	/* double rate slot select */

include/sound/control.h

View file

diff --git a/include/sound/control.h b/include/sound/control.h
index 7715e6f..e67db28 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -115,6 +115,8 @@ int snd_ctl_add(struct snd_card * card, struct snd_kcontrol * kcontrol);
 int snd_ctl_remove(struct snd_card * card, struct snd_kcontrol * kcontrol);
 int snd_ctl_remove_id(struct snd_card * card, struct snd_ctl_elem_id *id);
 int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id);
+int snd_ctl_activate_id(struct snd_card *card, struct snd_ctl_elem_id *id,
+			int active);
 struct snd_kcontrol *snd_ctl_find_numid(struct snd_card * card, unsigned int numid);
 struct snd_kcontrol *snd_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id);
 

include/sound/cs4271.h

View file

diff --git a/include/sound/cs4271.h b/include/sound/cs4271.h
new file mode 100644
index 0000000..50a059e
--- /dev/null
+++ b/include/sound/cs4271.h
@@ -0,0 +1,24 @@
+/*
+ * Definitions for CS4271 ASoC codec driver
+ *
+ * Copyright (c) 2010 Alexander Sverdlin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __CS4271_H
+#define __CS4271_H
+
+struct cs4271_platform_data {
+	int gpio_nreset;	/* GPIO driving Reset pin, if any */
+};
+
+#endif /* __CS4271_H */

include/sound/hdspm.h

View file

diff --git a/include/sound/hdspm.h b/include/sound/hdspm.h
index 81990b2..1774ff5 100644
--- a/include/sound/hdspm.h
+++ b/include/sound/hdspm.h
@@ -3,8 +3,8 @@
 /*
  *   Copyright (C) 2003 Winfried Ritsch (IEM)
  *   based on hdsp.h from Thomas Charbonnel ([email protected])
- *                      
- *    
+ *
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -23,50 +23,41 @@
 /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */
 #define HDSPM_MAX_CHANNELS      64
 
-/* -------------------- IOCTL Peak/RMS Meters -------------------- */
-
-/* peam rms level structure like we get from hardware 
-  
-   maybe in future we can memory map it so I just copy it
-   to user on ioctl call now an dont change anything
-   rms are made out of low and high values
-   where (long) ????_rms = (????_rms_l >> 8) + ((????_rms_h & 0xFFFFFF00)<<24)
-   (i asume so from the code)
-*/
-
-struct hdspm_peak_rms {
-
-	unsigned int level_offset[1024];
+enum hdspm_io_type {
+	MADI,
+	MADIface,
+	AIO,
+	AES32,
+	RayDAT
+};
 
-	unsigned int input_peak[64];
-	unsigned int playback_peak[64];
-	unsigned int output_peak[64];
-	unsigned int xxx_peak[64];	/* not used */
+enum hdspm_speed {
+	ss,
+	ds,
+	qs
+};
 
-	unsigned int reserved[256];	/* not used */
+/* -------------------- IOCTL Peak/RMS Meters -------------------- */
 
-	unsigned int input_rms_l[64];
-	unsigned int playback_rms_l[64];
-	unsigned int output_rms_l[64];
-	unsigned int xxx_rms_l[64];	/* not used */
+struct hdspm_peak_rms {
+	uint32_t input_peaks[64];
+	uint32_t playback_peaks[64];
+	uint32_t output_peaks[64];
 
-	unsigned int input_rms_h[64];
-	unsigned int playback_rms_h[64];
-	unsigned int output_rms_h[64];
-	unsigned int xxx_rms_h[64];	/* not used */
-};
+	uint64_t input_rms[64];
+	uint64_t playback_rms[64];
+	uint64_t output_rms[64];
 
-struct hdspm_peak_rms_ioctl {
-	struct hdspm_peak_rms *peak;
+	uint8_t speed; /* enum {ss, ds, qs} */
+	int status2;
 };
 
-/* use indirect access due to the limit of ioctl bit size */
 #define SNDRV_HDSPM_IOCTL_GET_PEAK_RMS \
-	_IOR('H', 0x40, struct hdspm_peak_rms_ioctl)
+	_IOR('H', 0x42, struct hdspm_peak_rms)
 
 /* ------------ CONFIG block IOCTL ---------------------- */
 
-struct hdspm_config_info {
+struct hdspm_config {
 	unsigned char pref_sync_ref;
 	unsigned char wordclock_sync_check;
 	unsigned char madi_sync_check;
@@ -80,18 +71,121 @@ struct hdspm_config_info {
 	unsigned int analog_out;
 };
 
-#define SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO \
-	_IOR('H', 0x41, struct hdspm_config_info)
+#define SNDRV_HDSPM_IOCTL_GET_CONFIG \
+	_IOR('H', 0x41, struct hdspm_config)
+
+/**
+ * If there's a TCO (TimeCode Option) board installed,
+ * there are further options and status data available.
+ * The hdspm_ltc structure contains the current SMPTE
+ * timecode and some status information and can be
+ * obtained via SNDRV_HDSPM_IOCTL_GET_LTC or in the
+ * hdspm_status struct.
+ **/
+
+enum hdspm_ltc_format {
+	format_invalid,
+	fps_24,
+	fps_25,
+	fps_2997,
+	fps_30
+};
+
+enum hdspm_ltc_frame {
+	frame_invalid,
+	drop_frame,
+	full_frame
+};
+
+enum hdspm_ltc_input_format {
+	ntsc,
+	pal,
+	no_video
+};
+
+struct hdspm_ltc {
+	unsigned int ltc;
 
+	enum hdspm_ltc_format format;
+	enum hdspm_ltc_frame frame;
+	enum hdspm_ltc_input_format input_format;
+};
+
+#define SNDRV_HDSPM_IOCTL_GET_LTC _IOR('H', 0x46, struct hdspm_mixer_ioctl)
+
+/**
+ * The status data reflects the device's current state
+ * as determined by the card's configuration and
+ * connection status.
+ **/
+
+enum hdspm_sync {
+	hdspm_sync_no_lock = 0,
+	hdspm_sync_lock = 1,
+	hdspm_sync_sync = 2
+};
 
-/* get Soundcard Version */
+enum hdspm_madi_input {
+	hdspm_input_optical = 0,
+	hdspm_input_coax = 1
+};
+
+enum hdspm_madi_channel_format {
+	hdspm_format_ch_64 = 0,
+	hdspm_format_ch_56 = 1
+};
+
+enum hdspm_madi_frame_format {
+	hdspm_frame_48 = 0,
+	hdspm_frame_96 = 1
+};
+
+enum hdspm_syncsource {
+	syncsource_wc = 0,
+	syncsource_madi = 1,
+	syncsource_tco = 2,
+	syncsource_sync = 3,
+	syncsource_none = 4
+};
+
+struct hdspm_status {
+	uint8_t card_type; /* enum hdspm_io_type */
+	enum hdspm_syncsource autosync_source;
+
+	uint64_t card_clock;
+	uint32_t master_period;
+
+	union {
+		struct {
+			uint8_t sync_wc; /* enum hdspm_sync */
+			uint8_t sync_madi; /* enum hdspm_sync */
+			uint8_t sync_tco; /* enum hdspm_sync */
+			uint8_t sync_in; /* enum hdspm_sync */
+			uint8_t madi_input; /* enum hdspm_madi_input */
+			uint8_t channel_format; /* enum hdspm_madi_channel_format */
+			uint8_t frame_format; /* enum hdspm_madi_frame_format */
+		} madi;
+	} card_specific;
+};
+
+#define SNDRV_HDSPM_IOCTL_GET_STATUS \
+	_IOR('H', 0x47, struct hdspm_status)
+
+/**
+ * Get information about the card and its add-ons.
+ **/
+
+#define HDSPM_ADDON_TCO 1
 
 struct hdspm_version {
+	uint8_t card_type; /* enum hdspm_io_type */
+	char cardname[20];
+	unsigned int serial;
 	unsigned short firmware_rev;
+	int addons;
 };
 
-#define SNDRV_HDSPM_IOCTL_GET_VERSION _IOR('H', 0x43, struct hdspm_version)
-
+#define SNDRV_HDSPM_IOCTL_GET_VERSION _IOR('H', 0x48, struct hdspm_version)
 
 /* ------------- get Matrix Mixer IOCTL --------------- */
 
@@ -103,7 +197,7 @@ struct hdspm_version {
 /* equivalent to hardware definition, maybe for future feature of mmap of
  * them
  */
-/* each of 64 outputs has 64 infader and 64 outfader: 
+/* each of 64 outputs has 64 infader and 64 outfader:
    Ins to Outs mixer[out].in[in], Outstreams to Outs mixer[out].pb[pb] */
 
 #define HDSPM_MIXER_CHANNELS HDSPM_MAX_CHANNELS
@@ -131,4 +225,5 @@ typedef struct hdspm_version hdspm_version_t;
 typedef struct hdspm_channelfader snd_hdspm_channelfader_t;
 typedef struct hdspm_mixer hdspm_mixer_t;
 
-#endif				/* __SOUND_HDSPM_H */
+
+#endif

include/sound/mixer_oss.h

View file

diff --git a/include/sound/mixer_oss.h b/include/sound/mixer_oss.h
index 51fbcb4..13cb0b4 100644
--- a/include/sound/mixer_oss.h
+++ b/include/sound/mixer_oss.h
@@ -73,6 +73,9 @@ struct snd_mixer_oss_file {
 	struct snd_mixer_oss *mixer;
 };
 
+int snd_mixer_oss_ioctl_card(struct snd_card *card,
+			     unsigned int cmd, unsigned long arg);
+
 #endif /* CONFIG_SND_MIXER_OSS */
 
 #endif /* __SOUND_MIXER_OSS_H */

include/sound/pcm.h

View file

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index e731f8d..430a9cc 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -136,48 +136,49 @@ struct snd_pcm_ops {
 					 SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000)
 #define SNDRV_PCM_RATE_8000_192000	(SNDRV_PCM_RATE_8000_96000|SNDRV_PCM_RATE_176400|\
 					 SNDRV_PCM_RATE_192000)
-#define SNDRV_PCM_FMTBIT_S8		(1ULL << SNDRV_PCM_FORMAT_S8)
-#define SNDRV_PCM_FMTBIT_U8		(1ULL << SNDRV_PCM_FORMAT_U8)
-#define SNDRV_PCM_FMTBIT_S16_LE		(1ULL << SNDRV_PCM_FORMAT_S16_LE)
-#define SNDRV_PCM_FMTBIT_S16_BE		(1ULL << SNDRV_PCM_FORMAT_S16_BE)
-#define SNDRV_PCM_FMTBIT_U16_LE		(1ULL << SNDRV_PCM_FORMAT_U16_LE)
-#define SNDRV_PCM_FMTBIT_U16_BE		(1ULL << SNDRV_PCM_FORMAT_U16_BE)
-#define SNDRV_PCM_FMTBIT_S24_LE		(1ULL << SNDRV_PCM_FORMAT_S24_LE)
-#define SNDRV_PCM_FMTBIT_S24_BE		(1ULL << SNDRV_PCM_FORMAT_S24_BE)
-#define SNDRV_PCM_FMTBIT_U24_LE		(1ULL << SNDRV_PCM_FORMAT_U24_LE)
-#define SNDRV_PCM_FMTBIT_U24_BE		(1ULL << SNDRV_PCM_FORMAT_U24_BE)
-#define SNDRV_PCM_FMTBIT_S32_LE		(1ULL << SNDRV_PCM_FORMAT_S32_LE)
-#define SNDRV_PCM_FMTBIT_S32_BE		(1ULL << SNDRV_PCM_FORMAT_S32_BE)
-#define SNDRV_PCM_FMTBIT_U32_LE		(1ULL << SNDRV_PCM_FORMAT_U32_LE)
-#define SNDRV_PCM_FMTBIT_U32_BE		(1ULL << SNDRV_PCM_FORMAT_U32_BE)
-#define SNDRV_PCM_FMTBIT_FLOAT_LE	(1ULL << SNDRV_PCM_FORMAT_FLOAT_LE)
-#define SNDRV_PCM_FMTBIT_FLOAT_BE	(1ULL << SNDRV_PCM_FORMAT_FLOAT_BE)
-#define SNDRV_PCM_FMTBIT_FLOAT64_LE	(1ULL << SNDRV_PCM_FORMAT_FLOAT64_LE)
-#define SNDRV_PCM_FMTBIT_FLOAT64_BE	(1ULL << SNDRV_PCM_FORMAT_FLOAT64_BE)
-#define SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE (1ULL << SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE)
-#define SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE (1ULL << SNDRV_PCM_FORMAT_IEC958_SUBFRAME_BE)
-#define SNDRV_PCM_FMTBIT_MU_LAW		(1ULL << SNDRV_PCM_FORMAT_MU_LAW)
-#define SNDRV_PCM_FMTBIT_A_LAW		(1ULL << SNDRV_PCM_FORMAT_A_LAW)
-#define SNDRV_PCM_FMTBIT_IMA_ADPCM	(1ULL << SNDRV_PCM_FORMAT_IMA_ADPCM)
-#define SNDRV_PCM_FMTBIT_MPEG		(1ULL << SNDRV_PCM_FORMAT_MPEG)
-#define SNDRV_PCM_FMTBIT_GSM		(1ULL << SNDRV_PCM_FORMAT_GSM)
-#define SNDRV_PCM_FMTBIT_SPECIAL	(1ULL << SNDRV_PCM_FORMAT_SPECIAL)
-#define SNDRV_PCM_FMTBIT_S24_3LE	(1ULL << SNDRV_PCM_FORMAT_S24_3LE)
-#define SNDRV_PCM_FMTBIT_U24_3LE	(1ULL << SNDRV_PCM_FORMAT_U24_3LE)
-#define SNDRV_PCM_FMTBIT_S24_3BE	(1ULL << SNDRV_PCM_FORMAT_S24_3BE)
-#define SNDRV_PCM_FMTBIT_U24_3BE	(1ULL << SNDRV_PCM_FORMAT_U24_3BE)
-#define SNDRV_PCM_FMTBIT_S20_3LE	(1ULL << SNDRV_PCM_FORMAT_S20_3LE)
-#define SNDRV_PCM_FMTBIT_U20_3LE	(1ULL << SNDRV_PCM_FORMAT_U20_3LE)
-#define SNDRV_PCM_FMTBIT_S20_3BE	(1ULL << SNDRV_PCM_FORMAT_S20_3BE)
-#define SNDRV_PCM_FMTBIT_U20_3BE	(1ULL << SNDRV_PCM_FORMAT_U20_3BE)
-#define SNDRV_PCM_FMTBIT_S18_3LE	(1ULL << SNDRV_PCM_FORMAT_S18_3LE)
-#define SNDRV_PCM_FMTBIT_U18_3LE	(1ULL << SNDRV_PCM_FORMAT_U18_3LE)
-#define SNDRV_PCM_FMTBIT_S18_3BE	(1ULL << SNDRV_PCM_FORMAT_S18_3BE)
-#define SNDRV_PCM_FMTBIT_U18_3BE	(1ULL << SNDRV_PCM_FORMAT_U18_3BE)
-#define SNDRV_PCM_FMTBIT_G723_24	(1ULL << SNDRV_PCM_FORMAT_G723_24)
-#define SNDRV_PCM_FMTBIT_G723_24_1B	(1ULL << SNDRV_PCM_FORMAT_G723_24_1B)
-#define SNDRV_PCM_FMTBIT_G723_40	(1ULL << SNDRV_PCM_FORMAT_G723_40)
-#define SNDRV_PCM_FMTBIT_G723_40_1B	(1ULL << SNDRV_PCM_FORMAT_G723_40_1B)
+#define _SNDRV_PCM_FMTBIT(fmt)		(1ULL << (__force int)SNDRV_PCM_FORMAT_##fmt)
+#define SNDRV_PCM_FMTBIT_S8		_SNDRV_PCM_FMTBIT(S8)
+#define SNDRV_PCM_FMTBIT_U8		_SNDRV_PCM_FMTBIT(U8)