Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2e341ca6 · Linus Torvalds <[email protected]> · 2012-05-23 13:05:43 -07:00

Pull sound updates from Takashi Iwai:
 "This is the first big chunk for 3.5 merges of sound stuff.

  There are a few big changes in different areas.  First off, the
  streaming logic of USB-audio endpoints has been largely rewritten for
  the better support of "implicit feedback".  If anything about USB got
  broken, this change has to be checked.

  For HD-audio, the resume procedure was changed; instead of delaying
  the resume of the hardware until the first use, now waking up
  immediately at resume.  This is for buggy BIOS.

  For ASoC, dynamic PCM support and the improved support for digital
  links between off-SoC devices are major framework changes.

  Some highlights are below:

  * HD-audio
   - Avoid accesses of invalid pin-control bits that may stall the codec
   - V-ref setup cleanups
   - Fix the races in power-saving code
   - Fix the races in codec cache hashes and connection lists
   - Split some common codes for BIOS auto-parser to hda_auto_parser.c
   - Changed the PM resume code to wake up immediately for buggy BIOS
   - Creative SoundCore3D support
   - Add Conexant CX20751/2/3/4 codec support

  * ASoC
   - Dynamic PCM support, allowing support for SoCs with internal
     routing through components with tight sequencing and formatting
     constraints within their internal paths or where there are multiple
     components connected with CPU managed DMA controllers inside the
     SoC.
   - Greatly improved support for direct digital links between off-SoC
     devices, providing a much simpler way of connecting things like
     digital basebands to CODECs.
   - Much more fine grained and robust locking, cleaning up some of the
     confusion that crept in with multi-component.
   - CPU support for nVidia Tegra 30 I2S and audio hub controllers and
     ST-Ericsson MSP I2S controolers
   - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,
     Texas Instruments LM49453.
   - Some regmap changes needed by the Tegra I2S driver.
   - mc13783 audio support.

  * Misc
   - Rewrite with module_pci_driver()
   - Xonar DGX support for snd-oxygen
   - Improvement of packet handling in snd-firewire driver
   - New USB-endpoint streaming logic
   - Enhanced M-audio FTU quirks and relevant cleanups
   - Increment the support of OSS devices to 256
   - snd-aloop accuracy improvement

  There are a few more pending changes for 3.5, but they will be sent
  slightly later as partly depending on the changes of DRM."

Fix up conflicts in regmap (due to duplicate patches, with some further
updates then having already come in from the regmap tree).  Also some
fairly trivial context conflicts in the imx and mcx soc drivers.

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)
  ALSA: snd-usb: fix stream info output in /proc
  ALSA: pcm - Add proper state checks to snd_pcm_drain()
  ALSA: sh: Fix up namespace collision in sh_dac_audio.
  ALSA: hda/realtek - Fix unused variable compile warning
  ASoC: sh: fsi: enable chip specific data transfer mode
  ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()
  ASoC: sh: fsi: use same format for IN/OUT
  ASoC: sh: fsi: add fsi_version() and removed meaningless version check
  ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC
  ASoC: tegra: Add machine driver for WM8753 codec
  ALSA: hda - Fix possible races of accesses to connection list array
  ASoC: OMAP: HDMI: Introduce codec
  ARM: mx31_3ds: Add sound support
  ASoC: imx-mc13783 cleanup
  mx31moboard: Add sound support
  ASoC: mc13783 codec cleanups
  ASoC: add imx-mc13783 sound support
  ASoC: Add mc13783 codec
  mfd: mc13xxx: add codec platform data
  ASoC: don't flip master of DT-instantiated DAI links
  ...

Commit: 2e341ca686042aa464efa755447e7bcee91d1eb6
Parents: 927ad551 · 85e184e4

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

Changes

291 files changed · +21923 −7915

File	Status	Add	Del	Content
Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt	added	+49	−0	View file
Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt	added	+17	−0	View file
Documentation/devicetree/bindings/sound/mxs-saif.txt	added	+36	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt	added	+32	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt	added	+15	−0	View file
Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt	added	+14	−0	View file
Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt	added	+54	−0	View file
Documentation/sound/alsa/ALSA-Configuration.txt	modified	+1	−1	View file
MAINTAINERS	modified	+6	−0	View file
arch/arm/mach-imx/Kconfig	modified	+2	−0	View file
arch/arm/mach-imx/mach-mx31_3ds.c	modified	+21	−1	View file
arch/arm/mach-imx/mach-mx31moboard.c	modified	+19	−1	View file
arch/arm/mach-shmobile/Kconfig	modified	+2	−0	View file
arch/arm/mach-shmobile/board-ap4evb.c	modified	+31	−4	View file
arch/arm/mach-shmobile/board-mackerel.c	modified	+31	−4	View file
arch/arm/mach-tegra/board-dt-tegra20.c	modified	+3	−3	View file
arch/arm/mach-tegra/board-harmony.c	modified	+0	−1	View file
arch/arm/mach-tegra/board-seaboard.c	modified	+0	−1	View file
arch/arm/mach-tegra/board-trimslice.c	modified	+0	−1	View file
arch/arm/mach-tegra/devices.c	modified	+3	−8	View file
arch/arm/mach-tegra/devices.h	modified	+0	−1	View file
arch/arm/mach-tegra/tegra2_clocks.c	modified	+2	−2	View file
arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig	modified	+1	−0	View file
arch/powerpc/configs/mpc85xx_defconfig	modified	+1	−0	View file
arch/powerpc/configs/mpc85xx_smp_defconfig	modified	+1	−0	View file
arch/sh/boards/Kconfig	modified	+2	−0	View file
arch/sh/boards/mach-ecovec24/setup.c	modified	+26	−0	View file
arch/sh/boards/mach-se/7724/setup.c	modified	+12	−3	View file
drivers/mfd/mc13xxx-core.c	modified	+2	−1	View file
include/linux/mfd/mc13xxx.h	modified	+11	−0	View file
include/sound/asound.h	modified	+14	−0	View file
include/sound/asoundef.h	modified	+41	−0	View file
include/sound/cs42l52.h	added	+36	−0	View file
include/sound/max98095.h	modified	+12	−0	View file
include/sound/sh_fsi.h	modified	+5	−13	View file
include/sound/simple_card.h	added	+38	−0	View file
include/sound/soc-dai.h	modified	+4	−0	View file
include/sound/soc-dapm.h	modified	+21	−7	View file
include/sound/soc-dpcm.h	added	+138	−0	View file
include/sound/soc.h	modified	+96	−22	View file
include/trace/events/asoc.h	modified	+80	−0	View file
sound/atmel/ac97c.c	modified	+2	−0	View file
sound/core/jack.c	modified	+4	−1	View file
sound/core/pcm_lib.c	modified	+10	−8	View file
sound/core/pcm_native.c	modified	+11	−1	View file
sound/core/sound_oss.c	modified	+3	−3	View file
sound/drivers/aloop.c	modified	+35	−27	View file
sound/firewire/amdtp.c	modified	+48	−1	View file
sound/firewire/amdtp.h	modified	+5	−24	View file
sound/pci/Kconfig	modified	+1	−1	View file
sound/pci/ad1889.c	modified	+1	−14	View file
sound/pci/ali5451/ali5451.c	modified	+2	−13	View file
sound/pci/als300.c	modified	+2	−13	View file
sound/pci/als4000.c	modified	+2	−13	View file
sound/pci/atiixp.c	modified	+2	−14	View file
sound/pci/atiixp_modem.c	modified	+2	−14	View file
sound/pci/au88x0/au88x0.c	modified	+2	−15	View file
sound/pci/aw2/aw2-alsa.c	modified	+3	−20	View file
sound/pci/azt3328.c	modified	+2	−21	View file
sound/pci/bt87x.c	modified	+2	−17	View file
sound/pci/ca0106/ca0106_main.c	modified	+2	−15	View file
sound/pci/cmipci.c	modified	+2	−13	View file
sound/pci/cs4281.c	modified	+2	−13	View file
sound/pci/cs46xx/cs46xx.c	modified	+2	−13	View file
sound/pci/cs5530.c	modified	+2	−14	View file
sound/pci/cs5535audio/cs5535audio.c	modified	+2	−13	View file
sound/pci/ctxfi/xfi.c	modified	+1	−12	View file
sound/pci/echoaudio/echoaudio.c	modified	+2	−20	View file
sound/pci/emu10k1/emu10k1.c	modified	+2	−13	View file
sound/pci/emu10k1/emu10k1x.c	modified	+2	−15	View file
sound/pci/ens1370.c	modified	+2	−13	View file
sound/pci/es1938.c	modified	+2	−13	View file
sound/pci/es1968.c	modified	+2	−13	View file
sound/pci/fm801.c	modified	+2	−13	View file
sound/pci/hda/Makefile	modified	+1	−1	View file
sound/pci/hda/hda_auto_parser.c	added	+760	−0	View file
sound/pci/hda/hda_auto_parser.h	added	+160	−0	View file
sound/pci/hda/hda_codec.c	modified	+282	−745	View file
sound/pci/hda/hda_codec.h	modified	+8	−7	View file
sound/pci/hda/hda_intel.c	modified	+27	−30	View file
sound/pci/hda/hda_jack.c	modified	+1	−0	View file
sound/pci/hda/hda_jack.h	modified	+2	−0	View file
sound/pci/hda/hda_local.h	modified	+43	−79	View file
sound/pci/hda/patch_analog.c	modified	+8	−6	View file
sound/pci/hda/patch_ca0110.c	modified	+4	−4	View file
sound/pci/hda/patch_ca0132.c	modified	+4	−5	View file
sound/pci/hda/patch_cirrus.c	modified	+10	−20	View file
sound/pci/hda/patch_cmedia.c	modified	+1	−0	View file
sound/pci/hda/patch_conexant.c	modified	+116	−70	View file
sound/pci/hda/patch_hdmi.c	modified	+2	−2	View file
sound/pci/hda/patch_realtek.c	modified	+130	−335	View file
sound/pci/hda/patch_sigmatel.c	modified	+44	−76	View file
sound/pci/hda/patch_via.c	modified	+13	−20	View file
sound/pci/ice1712/ice1712.c	modified	+2	−13	View file
sound/pci/ice1712/ice1724.c	modified	+2	−13	View file
sound/pci/intel8x0.c	modified	+2	−14	View file
sound/pci/intel8x0m.c	modified	+2	−14	View file
sound/pci/korg1212/korg1212.c	modified	+2	−13	View file
sound/pci/lola/lola.c	modified	+2	−13	View file
sound/pci/lx6464es/lx6464es.c	modified	+2	−15	View file
sound/pci/maestro3.c	modified	+2	−13	View file
sound/pci/mixart/mixart.c	modified	+2	−13	View file
sound/pci/nm256/nm256.c	modified	+2	−14	View file
sound/pci/oxygen/oxygen.c	modified	+9	−12	View file
sound/pci/oxygen/virtuoso.c	modified	+1	−12	View file
sound/pci/oxygen/xonar_dg.c	modified	+3	−4	View file
sound/pci/pcxhr/pcxhr.c	modified	+2	−13	View file
sound/pci/riptide/riptide.c	modified	+1	−2	View file
sound/pci/rme32.c	modified	+2	−13	View file
sound/pci/rme96.c	modified	+2	−13	View file
sound/pci/rme9652/hdsp.c	modified	+2	−13	View file
sound/pci/rme9652/hdspm.c	modified	+2	−14	View file
sound/pci/rme9652/rme9652.c	modified	+2	−13	View file
sound/pci/sis7019.c	modified	+1	−12	View file
sound/pci/sonicvibes.c	modified	+2	−13	View file
sound/pci/trident/trident.c	modified	+2	−13	View file
sound/pci/via82xx.c	modified	+2	−13	View file
sound/pci/via82xx_modem.c	modified	+2	−13	View file
sound/pci/vx222/vx222.c	modified	+2	−13	View file
sound/pci/ymfpci/ymfpci.c	modified	+2	−13	View file
sound/sh/sh_dac_audio.c	modified	+2	−2	View file
sound/soc/Kconfig	modified	+4	−1	View file
sound/soc/Makefile	modified	+2	−1	View file
sound/soc/blackfin/bf5xx-ssm2602.c	modified	+4	−33	View file
sound/soc/codecs/Kconfig	modified	+20	−0	View file
sound/soc/codecs/Makefile	modified	+11	−1	View file
sound/soc/codecs/ac97.c	modified	+2	−4	View file
sound/soc/codecs/ad1836.c	modified	+1	−3	View file
sound/soc/codecs/ad193x.c	modified	+1	−3	View file
sound/soc/codecs/adau1701.c	modified	+1	−2	View file
sound/soc/codecs/ak4104.c	modified	+1	−2	View file
sound/soc/codecs/ak4535.c	modified	+1	−2	View file
sound/soc/codecs/ak4641.c	modified	+50	−63	View file
sound/soc/codecs/alc5623.c	modified	+2	−21	View file
sound/soc/codecs/alc5632.c	modified	+3	−28	View file
sound/soc/codecs/cs4270.c	modified	+6	−5	View file
sound/soc/codecs/cs4271.c	modified	+1	−2	View file
sound/soc/codecs/cs42l51.c	modified	+4	−5	View file
sound/soc/codecs/cs42l52.c	added	+1295	−0	View file
sound/soc/codecs/cs42l52.h	added	+274	−0	View file
sound/soc/codecs/cs42l73.c	modified	+43	−50	View file
sound/soc/codecs/da7210.c	modified	+319	−60	View file
sound/soc/codecs/jz4740.c	modified	+1	−2	View file
sound/soc/codecs/lm49453.c	added	+1550	−0	View file
sound/soc/codecs/lm49453.h	added	+380	−0	View file
sound/soc/codecs/max98095.c	modified	+157	−1	View file
sound/soc/codecs/max98095.h	modified	+22	−0	View file
sound/soc/codecs/mc13783.c	added	+786	−0	View file
sound/soc/codecs/mc13783.h	added	+28	−0	View file
sound/soc/codecs/ml26124.c	added	+681	−0	View file
sound/soc/codecs/ml26124.h	added	+184	−0	View file
sound/soc/codecs/omap-hdmi.c	added	+69	−0	View file
sound/soc/codecs/rt5631.c	modified	+56	−54	View file
sound/soc/codecs/sgtl5000.c	modified	+7	−18	View file
sound/soc/codecs/ssm2602.c	modified	+94	−44	View file
sound/soc/codecs/sta32x.c	modified	+1	−2	View file
sound/soc/codecs/tlv320aic23.c	modified	+3	−10	View file
sound/soc/codecs/tlv320aic26.c	modified	+1	−2	View file
sound/soc/codecs/tlv320aic3x.c	modified	+1	−20	View file
sound/soc/codecs/tlv320dac33.c	modified	+15	−20	View file
sound/soc/codecs/twl4030.c	modified	+6	−12	View file
sound/soc/codecs/twl6040.c	modified	+15	−435	View file
sound/soc/codecs/uda134x.c	modified	+2	−4	View file
sound/soc/codecs/uda1380.c	modified	+2	−4	View file
sound/soc/codecs/wl1273.c	modified	+2	−4	View file
sound/soc/codecs/wm1250-ev1.c	modified	+46	−19	View file
sound/soc/codecs/wm5100-tables.c	modified	+123	−2	View file
sound/soc/codecs/wm5100.c	modified	+9	−38	View file
sound/soc/codecs/wm5100.h	modified	+159	−0	View file
sound/soc/codecs/wm8350.c	modified	+80	−107	View file
sound/soc/codecs/wm8400.c	modified	+67	−68	View file
sound/soc/codecs/wm8510.c	modified	+1	−2	View file
sound/soc/codecs/wm8523.c	modified	+1	−2	View file
sound/soc/codecs/wm8728.c	modified	+1	−2	View file
sound/soc/codecs/wm8731.c	modified	+10	−27	View file
sound/soc/codecs/wm8737.c	modified	+1	−2	View file
sound/soc/codecs/wm8741.c	modified	+1	−2	View file
sound/soc/codecs/wm8750.c	modified	+1	−2	View file
sound/soc/codecs/wm8753.c	modified	+2	−4	View file
sound/soc/codecs/wm8900.c	modified	+1	−2	View file
sound/soc/codecs/wm8903.c	modified	+1	−2	View file
sound/soc/codecs/wm8940.c	modified	+1	−2	View file
sound/soc/codecs/wm8960.c	modified	+1	−2	View file
sound/soc/codecs/wm8962.c	modified	+15	−3	View file
sound/soc/codecs/wm8971.c	modified	+1	−2	View file
sound/soc/codecs/wm8978.c	modified	+1	−2	View file
sound/soc/codecs/wm8988.c	modified	+1	−2	View file
sound/soc/codecs/wm8990.c	modified	+1	−2	View file
sound/soc/codecs/wm8993.c	modified	+2	−84	View file
sound/soc/codecs/wm8994.c	modified	+113	−177	View file
sound/soc/codecs/wm8994.h	modified	+3	−0	View file
sound/soc/codecs/wm8996.c	modified	+12	−0	View file
sound/soc/codecs/wm9081.c	modified	+3	−2	View file
sound/soc/codecs/wm9705.c	modified	+2	−4	View file
sound/soc/codecs/wm9712.c	modified	+4	−6	View file
sound/soc/codecs/wm_hubs.c	modified	+195	−25	View file
sound/soc/codecs/wm_hubs.h	modified	+9	−3	View file
sound/soc/ep93xx/ep93xx-ac97.c	modified	+26	−48	View file
sound/soc/ep93xx/ep93xx-i2s.c	modified	+14	−35	View file
sound/soc/fsl/Kconfig	modified	+122	−7	View file
sound/soc/fsl/Makefile	modified	+30	−1	View file
sound/soc/imx/eukrea-tlv320.c → sound/soc/fsl/eukrea-tlv320.c	renamed	+1	−1	View file
sound/soc/fsl/fsl_ssi.c	modified	+138	−29	View file
sound/soc/fsl/fsl_utils.c	added	+91	−0	View file
sound/soc/fsl/fsl_utils.h	added	+26	−0	View file
sound/soc/imx/imx-audmux.c → sound/soc/fsl/imx-audmux.c	renamed	+0	−0	View file
sound/soc/imx/imx-audmux.h → sound/soc/fsl/imx-audmux.h	renamed	+0	−0	View file
sound/soc/fsl/imx-mc13783.c	added	+156	−0	View file
sound/soc/imx/imx-pcm-dma-mx2.c → sound/soc/fsl/imx-pcm-dma.c	renamed	+2	−1	View file
sound/soc/imx/imx-pcm-fiq.c → sound/soc/fsl/imx-pcm-fiq.c	renamed	+0	−0	View file
sound/soc/imx/imx-pcm.c → sound/soc/fsl/imx-pcm.c	renamed	+0	−0	View file
sound/soc/imx/imx-pcm.h → sound/soc/fsl/imx-pcm.h	renamed	+1	−0	View file
sound/soc/fsl/imx-sgtl5000.c	added	+221	−0	View file
sound/soc/imx/imx-ssi.c → sound/soc/fsl/imx-ssi.c	renamed	+1	−1	View file
sound/soc/imx/imx-ssi.h → sound/soc/fsl/imx-ssi.h	renamed	+0	−0	View file
sound/soc/fsl/mpc8610_hpcd.c	modified	+11	−155	View file
sound/soc/imx/mx27vis-aic32x4.c → sound/soc/fsl/mx27vis-aic32x4.c	renamed	+0	−0	View file
sound/soc/fsl/p1022_ds.c	modified	+9	−149	View file
sound/soc/imx/phycore-ac97.c → sound/soc/fsl/phycore-ac97.c	renamed	+0	−0	View file
sound/soc/imx/wm1133-ev1.c → sound/soc/fsl/wm1133-ev1.c	renamed	+0	−0	View file
sound/soc/generic/Kconfig	added	+4	−0	View file
sound/soc/generic/Makefile	added	+3	−0	View file
sound/soc/generic/simple-card.c	added	+114	−0	View file
sound/soc/imx/Kconfig	deleted	+0	−79	View before deletion
sound/soc/imx/Makefile	deleted	+0	−22	View before deletion
sound/soc/jz4740/jz4740-i2s.c	modified	+2	−2	View file
sound/soc/mxs/mxs-pcm.c	modified	+6	−18	View file
sound/soc/mxs/mxs-pcm.h	modified	+3	−0	View file
sound/soc/mxs/mxs-saif.c	modified	+59	−33	View file
sound/soc/mxs/mxs-saif.h	modified	+0	−1	View file
sound/soc/mxs/mxs-sgtl5000.c	modified	+48	−2	View file
sound/soc/omap/Kconfig	modified	+1	−0	View file
sound/soc/pxa/pxa-ssp.c	modified	+11	−17	View file
sound/soc/pxa/pxa2xx-i2s.c	modified	+2	−2	View file
sound/soc/samsung/littlemill.c	modified	+90	−12	View file
sound/soc/samsung/lowland.c	modified	+31	−44	View file
sound/soc/samsung/speyside.c	modified	+4	−29	View file
sound/soc/sh/Kconfig	modified	+1	−23	View file
sound/soc/sh/Makefile	modified	+0	−6	View file
sound/soc/sh/fsi-ak4642.c	deleted	+0	−108	View before deletion
sound/soc/sh/fsi-da7210.c	deleted	+0	−81	View before deletion
sound/soc/sh/fsi-hdmi.c	deleted	+0	−118	View before deletion
sound/soc/sh/fsi.c	modified	+158	−66	View file
sound/soc/soc-core.c	modified	+487	−203	View file
sound/soc/soc-dapm.c	modified	+445	−117	View file
sound/soc/soc-jack.c	modified	+3	−2	View file
sound/soc/soc-pcm.c	modified	+1710	−62	View file
sound/soc/tegra/Kconfig	modified	+53	−15	View file
sound/soc/tegra/Makefile	modified	+13	−7	View file
sound/soc/tegra/tegra_das.c → sound/soc/tegra/tegra20_das.c	renamed	+84	−112	View file
sound/soc/tegra/tegra20_das.h	added	+134	−0	View file
sound/soc/tegra/tegra20_i2s.c	added	+494	−0	View file
sound/soc/tegra/tegra20_i2s.h	added	+164	−0	View file
sound/soc/tegra/tegra20_spdif.c	added	+404	−0	View file
sound/soc/tegra/tegra20_spdif.h	added	+471	−0	View file
sound/soc/tegra/tegra30_ahub.c	added	+631	−0	View file
sound/soc/tegra/tegra30_ahub.h	added	+483	−0	View file
sound/soc/tegra/tegra30_i2s.c	added	+536	−0	View file
sound/soc/tegra/tegra30_i2s.h	added	+242	−0	View file
sound/soc/tegra/tegra_alc5632.c	modified	+15	−33	View file
sound/soc/tegra/tegra_asoc_utils.c	modified	+32	−5	View file
sound/soc/tegra/tegra_asoc_utils.h	modified	+7	−2	View file
sound/soc/tegra/tegra_das.h	deleted	+0	−135	View before deletion
sound/soc/tegra/tegra_i2s.c	deleted	+0	−459	View before deletion
sound/soc/tegra/tegra_i2s.h	deleted	+0	−166	View before deletion
sound/soc/tegra/tegra_pcm.c	modified	+8	−20	View file
sound/soc/tegra/tegra_pcm.h	modified	+4	−1	View file
sound/soc/tegra/tegra_spdif.c	deleted	+0	−364	View before deletion
sound/soc/tegra/tegra_spdif.h	deleted	+0	−473	View before deletion
sound/soc/tegra/tegra_wm8753.c	added	+224	−0	View file
sound/soc/tegra/tegra_wm8903.c	modified	+7	−22	View file
sound/soc/tegra/trimslice.c	modified	+36	−5	View file
sound/soc/ux500/Kconfig	added	+14	−0	View file
sound/soc/ux500/Makefile	added	+4	−0	View file
sound/soc/ux500/ux500_msp_dai.c	added	+843	−0	View file
sound/soc/ux500/ux500_msp_dai.h	added	+79	−0	View file
sound/soc/ux500/ux500_msp_i2s.c	added	+742	−0	View file
sound/soc/ux500/ux500_msp_i2s.h	added	+553	−0	View file
sound/sound_core.c	modified	+1	−1	View file
sound/usb/card.c	modified	+9	−1	View file
sound/usb/card.h	modified	+60	−26	View file
sound/usb/endpoint.c	modified	+902	−707	View file
sound/usb/endpoint.h	modified	+20	−12	View file
sound/usb/mixer.c	modified	+35	−15	View file
sound/usb/mixer.h	modified	+3	−0	View file
sound/usb/mixer_maps.c	modified	+13	−0	View file
sound/usb/mixer_quirks.c	modified	+445	−27	View file
sound/usb/pcm.c	modified	+377	−76	View file
sound/usb/proc.c	modified	+22	−16	View file
sound/usb/stream.c	modified	+28	−3	View file
sound/usb/usbaudio.h	modified	+2	−0	View file

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

Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
new file mode 100644
index 0000000..e4acdd8
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
@@ -0,0 +1,49 @@
+Freescale i.MX audio complex with SGTL5000 codec
+
+Required properties:
+- compatible : "fsl,imx-audio-sgtl5000"
+- model : The user-visible name of this sound complex
+- ssi-controller : The phandle of the i.MX SSI controller
+- audio-codec : The phandle of the SGTL5000 audio codec
+- audio-routing : A list of the connections between audio components.
+  Each entry is a pair of strings, the first being the connection's sink,
+  the second being the connection's source. Valid names could be power
+  supplies, SGTL5000 pins, and the jacks on the board:
+
+  Power supplies:
+   * Mic Bias
+
+  SGTL5000 pins:
+   * MIC_IN
+   * LINE_IN
+   * HP_OUT
+   * LINE_OUT
+
+  Board connectors:
+   * Mic Jack
+   * Line In Jack
+   * Headphone Jack
+   * Line Out Jack
+   * Ext Spk
+
+- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX)
+- mux-ext-port : The external port of the i.MX audio muxer
+
+Note: The AUDMUX port numbering should start at 1, which is consistent with
+hardware manual.
+
+Example:
+
+sound {
+	compatible = "fsl,imx51-babbage-sgtl5000",
+		     "fsl,imx-audio-sgtl5000";
+	model = "imx51-babbage-sgtl5000";
+	ssi-controller = <&ssi1>;
+	audio-codec = <&sgtl5000>;
+	audio-routing =
+		"MIC_IN", "Mic Jack",
+		"Mic Jack", "Mic Bias",
+		"Headphone Jack", "HP_OUT";
+	mux-int-port = <1>;
+	mux-ext-port = <3>;
+};

Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt b/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt
new file mode 100644
index 0000000..601c518
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt
@@ -0,0 +1,17 @@
+* Freescale MXS audio complex with SGTL5000 codec
+
+Required properties:
+- compatible: "fsl,mxs-audio-sgtl5000"
+- model: The user-visible name of this sound complex
+- saif-controllers: The phandle list of the MXS SAIF controller
+- audio-codec: The phandle of the SGTL5000 audio codec
+
+Example:
+
+sound {
+	compatible = "fsl,imx28-evk-sgtl5000",
+		     "fsl,mxs-audio-sgtl5000";
+	model = "imx28-evk-sgtl5000";
+	saif-controllers = <&saif0 &saif1>;
+	audio-codec = <&sgtl5000>;
+};

Documentation/devicetree/bindings/sound/mxs-saif.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/mxs-saif.txt b/Documentation/devicetree/bindings/sound/mxs-saif.txt
new file mode 100644
index 0000000..c37ba61
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mxs-saif.txt
@@ -0,0 +1,36 @@
+* Freescale MXS Serial Audio Interface (SAIF)
+
+Required properties:
+- compatible: Should be "fsl,<chip>-saif"
+- reg: Should contain registers location and length
+- interrupts: Should contain ERROR and DMA interrupts
+- fsl,saif-dma-channel: APBX DMA channel for the SAIF
+
+Optional properties:
+- fsl,saif-master: phandle to the master SAIF.  It's only required for
+  the slave SAIF.
+
+Note: Each SAIF controller should have an alias correctly numbered
+in "aliases" node.
+
+Example:
+
+aliases {
+	saif0 = &saif0;
+	saif1 = &saif1;
+};
+
+saif0: saif@80042000 {
+	compatible = "fsl,imx28-saif";
+	reg = <0x80042000 2000>;
+	interrupts = <59 80>;
+	fsl,saif-dma-channel = <4>;
+};
+
+saif1: saif@80046000 {
+	compatible = "fsl,imx28-saif";
+	reg = <0x80046000 2000>;
+	interrupts = <58 81>;
+	fsl,saif-dma-channel = <5>;
+	fsl,saif-master = <&saif0>;
+};

Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt
new file mode 100644
index 0000000..1ac7b16
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt
@@ -0,0 +1,32 @@
+NVIDIA Tegra30 AHUB (Audio Hub)
+
+Required properties:
+- compatible : "nvidia,tegra30-ahub"
+- reg : Should contain the register physical address and length for each of
+  the AHUB's APBIF registers and the AHUB's own registers.
+- interrupts : Should contain AHUB interrupt
+- nvidia,dma-request-selector : The Tegra DMA controller's phandle and
+  request selector for the first APBIF channel.
+- ranges : The bus address mapping for the configlink register bus.
+  Can be empty since the mapping is 1:1.
+- #address-cells : For the configlink bus. Should be <1>;
+- #size-cells : For the configlink bus. Should be <1>.
+
+AHUB client modules need to specify the IDs of their CIFs (Client InterFaces).
+For RX CIFs, the numbers indicate the register number within AHUB routing
+register space (APBIF 0..3 RX, I2S 0..5 RX, DAM 0..2 RX 0..1, SPDIF RX 0..1).
+For TX CIFs, the numbers indicate the bit position within the AHUB routing
+registers (APBIF 0..3 TX, I2S 0..5 TX, DAM 0..2 TX, SPDIF TX 0..1).
+
+Example:
+
+ahub@70080000 {
+	compatible = "nvidia,tegra30-ahub";
+	reg = <0x70080000 0x200 0x70080200 0x100>;
+	interrupts = < 0 103 0x04 >;
+	nvidia,dma-request-selector = <&apbdma 1>;
+
+	ranges;
+	#address-cells = <1>;
+	#size-cells = <1>;
+};

Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt
new file mode 100644
index 0000000..dfa6c03
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt
@@ -0,0 +1,15 @@
+NVIDIA Tegra30 I2S controller
+
+Required properties:
+- compatible : "nvidia,tegra30-i2s"
+- reg : Should contain I2S registers location and length
+- nvidia,ahub-cif-ids : The list of AHUB CIF IDs for this port, rx (playback)
+  first, tx (capture) second. See nvidia,tegra30-ahub.txt for values.
+
+Example:
+
+i2s@70002800 {
+	compatible = "nvidia,tegra30-i2s";
+	reg = <0x70080300 0x100>;
+	nvidia,ahub-cif-ids = <4 4>;
+};

Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt b/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt
new file mode 100644
index 0000000..04b14cf
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt
@@ -0,0 +1,14 @@
+NVIDIA Tegra audio complex for TrimSlice
+
+Required properties:
+- compatible : "nvidia,tegra-audio-trimslice"
+- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller
+- nvidia,audio-codec : The phandle of the WM8903 audio codec
+
+Example:
+
+sound {
+	compatible = "nvidia,tegra-audio-trimslice";
+	nvidia,i2s-controller = <&tegra_i2s1>;
+	nvidia,audio-codec = <&codec>;
+};

Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt b/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt
new file mode 100644
index 0000000..c4dd39c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt
@@ -0,0 +1,54 @@
+NVIDIA Tegra audio complex
+
+Required properties:
+- compatible : "nvidia,tegra-audio-wm8753"
+- nvidia,model : The user-visible name of this sound complex.
+- nvidia,audio-routing : A list of the connections between audio components.
+  Each entry is a pair of strings, the first being the connection's sink,
+  the second being the connection's source. Valid names for sources and
+  sinks are the WM8753's pins, and the jacks on the board:
+
+  WM8753 pins:
+
+  * LOUT1
+  * LOUT2
+  * ROUT1
+  * ROUT2
+  * MONO1
+  * MONO2
+  * OUT3
+  * OUT4
+  * LINE1
+  * LINE2
+  * RXP
+  * RXN
+  * ACIN
+  * ACOP
+  * MIC1N
+  * MIC1
+  * MIC2N
+  * MIC2
+  * Mic Bias
+
+  Board connectors:
+
+  * Headphone Jack
+  * Mic Jack
+
+- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller
+- nvidia,audio-codec : The phandle of the WM8753 audio codec
+Example:
+
+sound {
+	compatible = "nvidia,tegra-audio-wm8753-whistler",
+		     "nvidia,tegra-audio-wm8753"
+	nvidia,model = "tegra-wm8753-harmony";
+
+	nvidia,audio-routing =
+		"Headphone Jack", "LOUT1",
+		"Headphone Jack", "ROUT1";
+
+	nvidia,i2s-controller = <&i2s1>;
+	nvidia,audio-codec = <&wm8753>;
+};
+

Documentation/sound/alsa/ALSA-Configuration.txt

View file

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 8c16d50..221b810 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1545,7 +1545,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     Module for sound cards based on the C-Media CMI8786/8787/8788 chip:
     * Asound A-8788
-    * Asus Xonar DG
+    * Asus Xonar DG/DGX
     * AuzenTech X-Meridian
     * AuzenTech X-Meridian 2G
     * Bgears b-Enspirer

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c293bf..61dd168 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6691,6 +6691,12 @@ F:	drivers/misc/tifm*
 F:	drivers/mmc/host/tifm_sd.c
 F:	include/linux/tifm.h
 
+TI LM49xxx FAMILY ASoC CODEC DRIVERS
+M:	M R Swami Reddy <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Maintained
+F:	sound/soc/codecs/lm49453*
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:	Peter Ujfalusi <[email protected]>
 L:	[email protected] (moderated for non-subscribers)

arch/arm/mach-imx/Kconfig

View file

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 7d6322c..cca8c0c 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -151,6 +151,7 @@ config MACH_MX25_3DS
 	select IMX_HAVE_PLATFORM_IMX2_WDT
 	select IMX_HAVE_PLATFORM_IMXDI_RTC
 	select IMX_HAVE_PLATFORM_IMX_I2C
+	select IMX_HAVE_PLATFORM_IMX_SSI
 	select IMX_HAVE_PLATFORM_IMX_FB
 	select IMX_HAVE_PLATFORM_IMX_KEYPAD
 	select IMX_HAVE_PLATFORM_IMX_UART
@@ -495,6 +496,7 @@ config MACH_MX31MOBOARD
 	select IMX_HAVE_PLATFORM_FSL_USB2_UDC
 	select IMX_HAVE_PLATFORM_IMX2_WDT
 	select IMX_HAVE_PLATFORM_IMX_I2C
+	select IMX_HAVE_PLATFORM_IMX_SSI
 	select IMX_HAVE_PLATFORM_IMX_UART
 	select IMX_HAVE_PLATFORM_IPU_CORE
 	select IMX_HAVE_PLATFORM_MXC_EHCI

arch/arm/mach-imx/mach-mx31_3ds.c

View file

diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 4d1aab1..4eafdf2 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -156,6 +156,11 @@ static int mx31_3ds_pins[] = {
 	MX31_PIN_CSI_VSYNC__CSI_VSYNC,
 	MX31_PIN_CSI_D5__GPIO3_5, /* CMOS PWDN */
 	IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_GPIO), /* CMOS reset */
+	/* SSI */
+	MX31_PIN_STXD4__STXD4,
+	MX31_PIN_SRXD4__SRXD4,
+	MX31_PIN_SCK4__SCK4,
+	MX31_PIN_SFS4__SFS4,
 };
 
 /*
@@ -488,12 +493,23 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {
 };
 
 /* MC13783 */
+static struct mc13xxx_codec_platform_data mx31_3ds_codec = {
+	.dac_ssi_port = MC13783_SSI1_PORT,
+	.adc_ssi_port = MC13783_SSI1_PORT,
+};
+
 static struct mc13xxx_platform_data mc13783_pdata = {
 	.regulators = {
 		.regulators = mx31_3ds_regulators,
 		.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
 	},
-	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
+	.codec = &mx31_3ds_codec,
+	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC | MC13XXX_USE_CODEC,
+
+};
+
+static struct imx_ssi_platform_data mx31_3ds_ssi_pdata = {
+	.flags = IMX_SSI_DMA | IMX_SSI_NET,
 };
 
 /* SPI */
@@ -741,6 +757,10 @@ static void __init mx31_3ds_init(void)
 	}
 
 	mx31_3ds_init_camera();
+
+	imx31_add_imx_ssi(0, &mx31_3ds_ssi_pdata);
+
+	imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);
 }
 
 static void __init mx31_3ds_timer_init(void)

arch/arm/mach-imx/mach-mx31moboard.c

View file

diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 1dfe3c7..016791f 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -47,6 +47,7 @@
 #include <mach/hardware.h>
 #include <mach/iomux-mx3.h>
 #include <mach/ulpi.h>
+#include <mach/ssi.h>
 
 #include "devices-imx31.h"
 
@@ -102,6 +103,9 @@ static unsigned int moboard_pins[] = {
 	MX31_PIN_CSPI3_MOSI__MOSI, MX31_PIN_CSPI3_MISO__MISO,
 	MX31_PIN_CSPI3_SCLK__SCLK, MX31_PIN_CSPI3_SPI_RDY__SPI_RDY,
 	MX31_PIN_CSPI2_SS1__CSPI3_SS1,
+	/* SSI */
+	MX31_PIN_STXD4__STXD4, MX31_PIN_SRXD4__SRXD4,
+	MX31_PIN_SCK4__SCK4, MX31_PIN_SFS4__SFS4,
 };
 
 static struct physmap_flash_data mx31moboard_flash_data = {
@@ -276,6 +280,11 @@ static struct mc13xxx_buttons_platform_data moboard_buttons = {
 	.b1on_key = KEY_POWER,
 };
 
+static struct mc13xxx_codec_platform_data moboard_codec = {
+	.dac_ssi_port = MC13783_SSI1_PORT,
+	.adc_ssi_port = MC13783_SSI1_PORT,
+};
+
 static struct mc13xxx_platform_data moboard_pmic = {
 	.regulators = {
 		.regulators = moboard_regulators,
@@ -283,7 +292,12 @@ static struct mc13xxx_platform_data moboard_pmic = {
 	},
 	.leds = &moboard_leds,
 	.buttons = &moboard_buttons,
-	.flags = MC13XXX_USE_RTC | MC13XXX_USE_ADC,
+	.codec = &moboard_codec,
+	.flags = MC13XXX_USE_RTC | MC13XXX_USE_ADC | MC13XXX_USE_CODEC,
+};
+
+static struct imx_ssi_platform_data moboard_ssi_pdata = {
+	.flags = IMX_SSI_DMA | IMX_SSI_NET,
 };
 
 static struct spi_board_info moboard_spi_board_info[] __initdata = {
@@ -554,6 +568,10 @@ static void __init mx31moboard_init(void)
 
 	moboard_usbh2_init();
 
+	imx31_add_imx_ssi(0, &moboard_ssi_pdata);
+
+	imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);
+
 	pm_power_off = mx31moboard_poweroff;
 
 	switch (mx31moboard_baseboard) {

arch/arm/mach-shmobile/Kconfig

View file

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 98327b7..f31383c 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -64,6 +64,7 @@ config MACH_AP4EVB
 	depends on ARCH_SH7372
 	select ARCH_REQUIRE_GPIOLIB
 	select SH_LCD_MIPI_DSI
+	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
 choice
 	prompt "AP4EVB LCD panel selection"
@@ -88,6 +89,7 @@ config MACH_MACKEREL
 	bool "mackerel board"
 	depends on ARCH_SH7372
 	select ARCH_REQUIRE_GPIOLIB
+	select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
 config MACH_KOTA2
 	bool "KOTA2 board"

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 0c3caeb..b540b8e 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -50,6 +50,7 @@
 #include <media/soc_camera.h>
 
 #include <sound/sh_fsi.h>
+#include <sound/simple_card.h>
 
 #include <video/sh_mobile_hdmi.h>
 #include <video/sh_mobile_lcdc.h>
@@ -785,17 +786,25 @@ static struct platform_device fsi_device = {
 	},
 };
 
-static struct fsi_ak4642_info fsi2_ak4643_info = {
+static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = {
+	.fmt		= SND_SOC_DAIFMT_LEFT_J,
+	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,
+	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,
+	.sysclk		= 11289600,
+};
+
+static struct asoc_simple_card_info fsi2_ak4643_info = {
 	.name		= "AK4643",
 	.card		= "FSI2A-AK4643",
 	.cpu_dai	= "fsia-dai",
 	.codec		= "ak4642-codec.0-0013",
 	.platform	= "sh_fsi2",
-	.id		= FSI_PORT_A,
+	.codec_dai	= "ak4642-hifi",
+	.init		= &fsi2_ak4643_init_info,
 };
 
 static struct platform_device fsi_ak4643_device = {
-	.name	= "fsi-ak4642-audio",
+	.name	= "asoc-simple-card",
 	.dev	= {
 		.platform_data	= &fsi2_ak4643_info,
 	},
@@ -900,8 +909,26 @@ static struct platform_device lcdc1_device = {
 	},
 };
 
+static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
+	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct asoc_simple_card_info fsi2_hdmi_info = {
+	.name		= "HDMI",
+	.card		= "FSI2B-HDMI",
+	.cpu_dai	= "fsib-dai",
+	.codec		= "sh-mobile-hdmi",
+	.platform	= "sh_fsi2",
+	.codec_dai	= "sh_mobile_hdmi-hifi",
+	.init		= &fsi2_hdmi_init_info,
+};
+
 static struct platform_device fsi_hdmi_device = {
-	.name		= "sh_fsi2_b_hdmi",
+	.name	= "asoc-simple-card",
+	.id	= 1,
+	.dev	= {
+		.platform_data	= &fsi2_hdmi_info,
+	},
 };
 
 static struct gpio_led ap4evb_leds[] = {

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 aae2e24..50c67b2 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -53,6 +53,7 @@
 #include <media/soc_camera.h>
 #include <media/soc_camera_platform.h>
 #include <sound/sh_fsi.h>
+#include <sound/simple_card.h>
 
 #include <mach/common.h>
 #include <mach/irqs.h>
@@ -502,8 +503,26 @@ static struct platform_device hdmi_lcdc_device = {
 	},
 };
 
+static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
+	.cpu_daifmt	= SND_SOC_DAIFMT_CBM_CFM,
+};
+
+static struct asoc_simple_card_info fsi2_hdmi_info = {
+	.name		= "HDMI",
+	.card		= "FSI2B-HDMI",
+	.cpu_dai	= "fsib-dai",
+	.codec		= "sh-mobile-hdmi",
+	.platform	= "sh_fsi2",
+	.codec_dai	= "sh_mobile_hdmi-hifi",
+	.init		= &fsi2_hdmi_init_info,
+};
+
 static struct platform_device fsi_hdmi_device = {
-	.name		= "sh_fsi2_b_hdmi",
+	.name	= "asoc-simple-card",
+	.id	= 1,
+	.dev	= {
+		.platform_data	= &fsi2_hdmi_info,
+	},
 };
 
 static void __init hdmi_init_pm_clock(void)
@@ -945,17 +964,25 @@ static struct platform_device fsi_device = {
 	},
 };
 
-static struct fsi_ak4642_info fsi2_ak4643_info = {
+static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = {
+	.fmt		= SND_SOC_DAIFMT_LEFT_J,
+	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,
+	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,
+	.sysclk		= 11289600,
+};
+
+static struct asoc_simple_card_info fsi2_ak4643_info = {
 	.name		= "AK4643",
 	.card		= "FSI2A-AK4643",
 	.cpu_dai	= "fsia-dai",
 	.codec		= "ak4642-codec.0-0013",
 	.platform	= "sh_fsi2",
-	.id		= FSI_PORT_A,
+	.codec_dai	= "ak4642-hifi",
+	.init		= &fsi2_ak4643_init_info,
 };
 
 static struct platform_device fsi_ak4643_device = {
-	.name	= "fsi-ak4642-audio",
+	.name	= "asoc-simple-card",
 	.dev	= {
 		.platform_data	= &fsi2_ak4643_info,
 	},

arch/arm/mach-tegra/board-dt-tegra20.c

View file

diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
index 8351c4c..fac3eb1 100644
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -55,9 +55,9 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C2_BASE, "tegra-i2c.1", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C3_BASE, "tegra-i2c.2", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-i2c-dvc", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),
-	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra-i2s.0", NULL),
-	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL),
-	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL),
+	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra20-i2s.0", NULL),
+	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra20-i2s.1", NULL),
+	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra20-das", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0",
 		       &tegra_ehci1_pdata),
 	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1",

arch/arm/mach-tegra/board-harmony.c

View file

diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index 222182e..b906b3b 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -124,7 +124,6 @@ static struct platform_device *harmony_devices[] __initdata = {

This diff is incomplete. Download the complete patch.