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

dbf7b591 · Linus Torvalds <[email protected]> · 2012-07-24 13:37:37 -07:00

Pull sound update from Takashi Iwai:
 "This is a fairly quiet release in all sound area.  Only a little bit
  of changes in the core side while most of changes are seen in the
  drivers.

  HD-audio:
   - A few new codec additions for Nvidia, Realtek and VIA
   - Intel Haswell audio support
   - Support for "phantom" jacks for consistent jack reporting
   - Major clean-ups in HDMI/DP driver codes
   - A workaround for inverted digital-mic pins with Realtek codecs
   - Removal of beep_mode=2 option

  ASoC:
   - Added the ability to add and remove DAPM paths dynamically, mostly
     for reparenting on clock changes
   - New machine drivers for Marvell Brownstone, ST-Ericsson Ux500
     reference platform and ttc-dkp
   - New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP,
     Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF
   - New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500,
     TI Isabelle and Wolfson Microelectronics WM5102 and WM5110
   - DAPM fixes for the recent locking changes
   - Fix for _PRE and _POST widgets (which have been broken for a few
     releases now)
   - A couple of minor driver updates

  Misc
   - Conversion to new dev_pm_ops in platform and PCI drivers
   - LTC support and some fixes in PCXHR driver
   - A few fixes and PM support for ISA OPti9xx and WSS cards
   - Some TLV code cleanup
   - Move driver-specific headers from include/sound to local dirs"

* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (212 commits)
  ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements
  ALSA: hda - add dock support for Thinkpad X230 Tablet
  ALSA: hda - Turn on PIN_OUT from hdmi playback prepare.
  ASoC imx-audmux: add MX31_AUDMUX_PORT7_SSI_PINS_7 define
  ASoC: littlemill: Add userspace control of the WM1250 I/O
  ASoC: wm8994: Update micdet for irqdomain conversion
  ALSA: hda - make sure alc268 does not OOPS on codec parse
  ALSA: hda - Add support for Realtek ALC282
  ALSA: hda - Fix index number conflicts of phantom jacks
  ALSA: opti9xx: Fix section mismatch by PM support
  ALSA: snd-opti9xx: Implement suspend/resume
  ALSA: hda - Add new GPU codec ID to snd-hda
  ALSA: hda - Fix driver type of Haswell controller to AZX_DRIVER_SCH
  ALSA: hda - add Haswell HDMI codec id
  ALSA: hda - Add DeviceID for Haswell HDA
  ALSA: wss_lib: Fix resume on Yamaha OPL3-SAx
  ALSA: wss_lib: fix suspend/resume
  ALSA: es1938: replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE
  ALSA: tlv: add DECLARE_TLV_DB_RANGE()
  ALSA: tlv: add DECLARE_TLV_CONTAINER()
  ...

Commit: dbf7b5915b39bfff548e4c6a3a753fc291a60e25
Parents: d14b7a41 · c1b623d9

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

Changes

239 files changed · +18347 −2642

File	Status	Add	Del	Content
Documentation/sound/alsa/ALSA-Configuration.txt	modified	+1	−2	View file
Documentation/sound/alsa/HD-Audio-Models.txt	modified	+10	−3	View file
MAINTAINERS	modified	+2	−0	View file
arch/arm/mach-ux500/board-mop500.c	modified	+14	−0	View file
include/linux/ac97_codec.h	deleted	+0	−362	View before deletion
include/linux/dmaengine.h	modified	+6	−0	View file
include/linux/mfd/abx500/ab8500-codec.h	added	+52	−0	View file
include/linux/mfd/abx500/ab8500.h	modified	+2	−0	View file
include/linux/platform_data/mmp_audio.h	added	+22	−0	View file
include/sound/designware_i2s.h	added	+69	−0	View file
include/sound/dmaengine_pcm.h	modified	+1	−0	View file
include/sound/pcm.h	modified	+13	−1	View file
include/sound/pcm_params.h	modified	+2	−0	View file
include/sound/soc-dapm.h	modified	+12	−0	View file
include/sound/soc.h	modified	+72	−5	View file
include/sound/spear_dma.h	added	+35	−0	View file
include/sound/spear_spdif.h	added	+29	−0	View file
include/sound/tlv.h	modified	+21	−8	View file
include/sound/vx_core.h	modified	+1	−1	View file
sound/arm/pxa2xx-ac97.c	modified	+3	−6	View file
sound/atmel/abdac.c	modified	+10	−8	View file
sound/atmel/ac97c.c	modified	+10	−8	View file
sound/core/pcm_lib.c	modified	+2	−2	View file
sound/core/pcm_misc.c	modified	+18	−0	View file
sound/drivers/aloop.c	modified	+12	−10	View file
sound/drivers/dummy.c	modified	+12	−9	View file
sound/drivers/mpu401/mpu401.c	modified	+2	−1	View file
sound/drivers/mtpav.c	modified	+2	−1	View file
sound/drivers/mts64.c	modified	+2	−1	View file
sound/drivers/pcsp/pcsp.c	modified	+7	−4	View file
sound/drivers/portman2x4.c	modified	+2	−1	View file
sound/drivers/serial-u16550.c	modified	+2	−1	View file
sound/drivers/virmidi.c	modified	+2	−1	View file
sound/drivers/vx/vx_core.c	modified	+1	−1	View file
sound/isa/opti9xx/opti92x-ad1848.c	modified	+72	−14	View file
sound/isa/wss/wss_lib.c	modified	+4	−1	View file
sound/oss/swarm_cs4297a.c	modified	+16	−1	View file
sound/pci/ali5451/ali5451.c	modified	+15	−9	View file
sound/pci/als300.c	modified	+15	−9	View file
sound/pci/als4000.c	modified	+15	−10	View file
sound/pci/atiixp.c	modified	+15	−9	View file
sound/pci/atiixp_modem.c	modified	+15	−10	View file
sound/pci/au88x0/au88x0_mixer.c	modified	+11	−0	View file
sound/pci/azt3328.c	modified	+15	−10	View file
sound/pci/ca0106/ca0106_main.c	modified	+15	−9	View file
sound/pci/cmipci.c	modified	+15	−9	View file
sound/pci/cs4281.c	modified	+15	−9	View file
sound/pci/cs46xx/cs46xx.c	modified	+4	−3	View file
include/sound/cs46xx.h → sound/pci/cs46xx/cs46xx.h	renamed	+5	−6	View file
include/sound/cs46xx_dsp_scb_types.h → sound/pci/cs46xx/cs46xx_dsp_scb_types.h	renamed	+0	−0	View file
include/sound/cs46xx_dsp_spos.h → sound/pci/cs46xx/cs46xx_dsp_spos.h	renamed	+0	−0	View file
include/sound/cs46xx_dsp_task_types.h → sound/pci/cs46xx/cs46xx_dsp_task_types.h	renamed	+0	−0	View file
sound/pci/cs46xx/cs46xx_lib.c	modified	+10	−6	View file
sound/pci/cs46xx/dsp_spos.c	modified	+1	−1	View file
sound/pci/cs46xx/dsp_spos_scb_lib.c	modified	+1	−1	View file
sound/pci/cs5535audio/cs5535audio.c	modified	+3	−2	View file
sound/pci/cs5535audio/cs5535audio.h	modified	+1	−4	View file
sound/pci/cs5535audio/cs5535audio_pm.c	modified	+8	−5	View file
sound/pci/ctxfi/ctatc.c	modified	+2	−2	View file
sound/pci/ctxfi/ctatc.h	modified	+1	−1	View file
sound/pci/ctxfi/cthardware.h	modified	+1	−1	View file
sound/pci/ctxfi/cthw20k1.c	modified	+2	−2	View file
sound/pci/ctxfi/cthw20k2.c	modified	+2	−2	View file
sound/pci/ctxfi/xfi.c	modified	+13	−9	View file
sound/pci/echoaudio/echoaudio.c	modified	+13	−9	View file
sound/pci/emu10k1/emu10k1.c	modified	+16	−10	View file
sound/pci/ens1370.c	modified	+15	−10	View file
sound/pci/es1938.c	modified	+25	−24	View file
sound/pci/es1968.c	modified	+15	−9	View file
sound/pci/fm801.c	modified	+16	−10	View file
sound/pci/hda/Kconfig	modified	+3	−4	View file
sound/pci/hda/hda_auto_parser.c	modified	+2	−2	View file
sound/pci/hda/hda_beep.c	modified	+37	−45	View file
sound/pci/hda/hda_beep.h	modified	+0	−5	View file
sound/pci/hda/hda_codec.c	modified	+43	−25	View file
sound/pci/hda/hda_codec.h	modified	+4	−1	View file
sound/pci/hda/hda_intel.c	modified	+38	−17	View file
sound/pci/hda/hda_jack.c	modified	+70	−32	View file
sound/pci/hda/hda_jack.h	modified	+1	−0	View file
sound/pci/hda/hda_local.h	modified	+3	−1	View file
sound/pci/hda/hda_proc.c	modified	+12	−5	View file
sound/pci/hda/patch_analog.c	modified	+1	−1	View file
sound/pci/hda/patch_cirrus.c	modified	+1	−1	View file
sound/pci/hda/patch_conexant.c	modified	+1	−1	View file
sound/pci/hda/patch_hdmi.c	modified	+167	−143	View file
sound/pci/hda/patch_realtek.c	modified	+263	−50	View file
sound/pci/hda/patch_sigmatel.c	modified	+1	−1	View file
sound/pci/hda/patch_via.c	modified	+1	−1	View file
sound/pci/ice1712/ice1724.c	modified	+16	−10	View file
sound/pci/intel8x0.c	modified	+15	−9	View file
sound/pci/intel8x0m.c	modified	+15	−9	View file
sound/pci/maestro3.c	modified	+15	−77	View file
sound/pci/nm256/nm256.c	modified	+15	−9	View file
sound/pci/oxygen/oxygen.c	modified	+3	−2	View file
sound/pci/oxygen/oxygen.h	modified	+1	−2	View file
sound/pci/oxygen/oxygen_lib.c	modified	+10	−7	View file
sound/pci/oxygen/virtuoso.c	modified	+3	−2	View file
sound/pci/pcxhr/pcxhr.c	modified	+63	−0	View file
sound/pci/pcxhr/pcxhr.h	modified	+1	−0	View file
sound/pci/pcxhr/pcxhr_core.c	modified	+19	−8	View file
sound/pci/pcxhr/pcxhr_core.h	modified	+3	−1	View file
sound/pci/pcxhr/pcxhr_mix22.c	modified	+11	−0	View file
sound/pci/pcxhr/pcxhr_mix22.h	modified	+1	−0	View file
sound/pci/riptide/riptide.c	modified	+16	−10	View file
sound/pci/sis7019.c	modified	+15	−10	View file
sound/pci/trident/trident.c	modified	+4	−3	View file
include/sound/trident.h → sound/pci/trident/trident.h	renamed	+5	−6	View file
sound/pci/trident/trident_main.c	modified	+10	−6	View file
sound/pci/trident/trident_memory.c	modified	+1	−1	View file
sound/pci/via82xx.c	modified	+15	−9	View file
sound/pci/via82xx_modem.c	modified	+15	−9	View file
sound/pci/vx222/vx222.c	modified	+16	−10	View file
sound/pci/ymfpci/ymfpci.c	modified	+4	−3	View file
include/sound/ymfpci.h → sound/pci/ymfpci/ymfpci.h	renamed	+5	−6	View file
sound/pci/ymfpci/ymfpci_main.c	modified	+10	−6	View file
sound/pcmcia/pdaudiocf/pdaudiocf.c	modified	+1	−1	View file
sound/pcmcia/pdaudiocf/pdaudiocf.h	modified	+1	−1	View file
sound/pcmcia/pdaudiocf/pdaudiocf_core.c	modified	+1	−1	View file
sound/pcmcia/vx/vxpocket.c	modified	+1	−1	View file
sound/ppc/powermac.c	modified	+12	−9	View file
sound/sh/aica.c	modified	+3	−1	View file
sound/sh/sh_dac_audio.c	modified	+1	−0	View file
sound/soc/Kconfig	modified	+1	−0	View file
sound/soc/Makefile	modified	+1	−0	View file
sound/soc/blackfin/Kconfig	modified	+15	−6	View file
sound/soc/blackfin/Makefile	modified	+4	−0	View file
sound/soc/blackfin/bf6xx-i2s.c	added	+234	−0	View file
sound/soc/blackfin/bf6xx-sport.c	added	+422	−0	View file
sound/soc/blackfin/bf6xx-sport.h	added	+82	−0	View file
sound/soc/codecs/Kconfig	modified	+31	−0	View file
sound/soc/codecs/Makefile	modified	+17	−2	View file
sound/soc/codecs/ab8500-codec.c	added	+2522	−0	View file
sound/soc/codecs/ab8500-codec.h	added	+590	−0	View file
sound/soc/codecs/ac97.c	modified	+0	−6	View file
sound/soc/codecs/arizona.c	added	+937	−0	View file
sound/soc/codecs/arizona.h	added	+159	−0	View file
sound/soc/codecs/cs42l52.c	modified	+4	−15	View file
sound/soc/codecs/cs42l73.c	modified	+5	−15	View file
sound/soc/codecs/da732x.c	added	+1627	−0	View file
sound/soc/codecs/da732x.h	added	+133	−0	View file
sound/soc/codecs/da732x_reg.h	added	+654	−0	View file
sound/soc/codecs/isabelle.c	added	+1176	−0	View file
sound/soc/codecs/isabelle.h	added	+143	−0	View file
sound/soc/codecs/lm49453.c	modified	+1	−2	View file
sound/soc/codecs/max98095.c	modified	+3	−2	View file
sound/soc/codecs/ml26124.c	modified	+1	−4	View file
sound/soc/codecs/spdif_receiver.c	added	+67	−0	View file
sound/soc/codecs/sta529.c	added	+442	−0	View file
sound/soc/codecs/tlv320aic3x.c	modified	+38	−2	View file
sound/soc/codecs/tlv320aic3x.h	modified	+26	−1	View file
sound/soc/codecs/twl6040.c	modified	+1	−1	View file
sound/soc/codecs/wm1250-ev1.c	modified	+5	−2	View file
sound/soc/codecs/wm2000.c	modified	+31	−1	View file
sound/soc/codecs/wm5100-tables.c	modified	+1	−1	View file
sound/soc/codecs/wm5100.c	modified	+1	−10	View file
sound/soc/codecs/wm5102.c	added	+903	−0	View file
sound/soc/codecs/wm5102.h	added	+21	−0	View file
sound/soc/codecs/wm5110.c	added	+950	−0	View file
sound/soc/codecs/wm5110.h	added	+21	−0	View file
sound/soc/codecs/wm8350.c	modified	+4	−18	View file
sound/soc/codecs/wm8400.c	modified	+1	−1	View file
sound/soc/codecs/wm8580.c	modified	+1	−1	View file
sound/soc/codecs/wm8731.c	modified	+1	−0	View file
sound/soc/codecs/wm8741.c	modified	+1	−1	View file
sound/soc/codecs/wm8753.c	modified	+1	−1	View file
sound/soc/codecs/wm8776.c	modified	+1	−1	View file
sound/soc/codecs/wm8804.c	modified	+1	−1	View file
sound/soc/codecs/wm8903.c	modified	+162	−154	View file
sound/soc/codecs/wm8904.c	modified	+109	−163	View file
sound/soc/codecs/wm8960.c	modified	+2	−0	View file
sound/soc/codecs/wm8961.c	modified	+2	−0	View file
sound/soc/codecs/wm8962.c	modified	+7	−1	View file
sound/soc/codecs/wm8993.c	modified	+1	−1	View file
sound/soc/codecs/wm8994.c	modified	+5	−41	View file
sound/soc/codecs/wm8996.c	modified	+215	−372	View file
sound/soc/codecs/wm9081.c	modified	+1	−1	View file
sound/soc/codecs/wm9090.c	modified	+1	−1	View file
sound/soc/codecs/wm9712.c	modified	+1	−1	View file
sound/soc/codecs/wm9713.c	modified	+1	−1	View file
sound/soc/codecs/wm_hubs.c	modified	+1	−1	View file
sound/soc/dwc/Kconfig	added	+9	−0	View file
sound/soc/dwc/Makefile	added	+3	−0	View file
sound/soc/dwc/designware_i2s.c	added	+455	−0	View file
sound/soc/ep93xx/ep93xx-pcm.c	modified	+1	−1	View file
sound/soc/fsl/imx-audmux.c	modified	+1	−1	View file
sound/soc/fsl/imx-audmux.h	modified	+1	−0	View file
sound/soc/fsl/imx-mc13783.c	modified	+33	−16	View file
sound/soc/fsl/imx-pcm-dma.c	modified	+1	−1	View file
sound/soc/fsl/imx-sgtl5000.c	modified	+1	−2	View file
sound/soc/mxs/mxs-pcm.c	modified	+1	−1	View file
sound/soc/mxs/mxs-sgtl5000.c	modified	+1	−1	View file
sound/soc/omap/omap-mcpdm.c	modified	+1	−0	View file
sound/soc/pxa/Kconfig	modified	+42	−0	View file
sound/soc/pxa/Makefile	modified	+8	−0	View file
sound/soc/pxa/brownstone.c	added	+174	−0	View file
sound/soc/pxa/mioa701_wm9713.c	modified	+12	−21	View file
sound/soc/pxa/mmp-pcm.c	added	+297	−0	View file
sound/soc/pxa/mmp-sspa.c	added	+480	−0	View file
sound/soc/pxa/mmp-sspa.h	added	+92	−0	View file
sound/soc/pxa/ttc-dkb.c	added	+173	−0	View file
sound/soc/samsung/littlemill.c	modified	+7	−0	View file
sound/soc/samsung/s3c2412-i2s.c	modified	+3	−7	View file
sound/soc/samsung/s3c24xx-i2s.c	modified	+3	−7	View file
sound/soc/samsung/smdk_wm8994.c	modified	+23	−13	View file
sound/soc/sh/fsi.c	modified	+24	−24	View file
sound/soc/soc-core.c	modified	+264	−64	View file
sound/soc/soc-dapm.c	modified	+163	−29	View file
sound/soc/soc-dmaengine-pcm.c	modified	+30	−3	View file
sound/soc/soc-io.c	modified	+10	−5	View file
sound/soc/soc-pcm.c	modified	+5	−7	View file
sound/soc/spear/spdif_in.c	added	+297	−0	View file
sound/soc/spear/spdif_in_regs.h	added	+60	−0	View file
sound/soc/spear/spdif_out.c	added	+389	−0	View file
sound/soc/spear/spdif_out_regs.h	added	+79	−0	View file
sound/soc/spear/spear_pcm.c	added	+214	−0	View file
sound/soc/tegra/Kconfig	modified	+2	−1	View file
sound/soc/tegra/tegra20_i2s.c	modified	+46	−48	View file
sound/soc/tegra/tegra20_i2s.h	modified	+0	−1	View file
sound/soc/tegra/tegra20_spdif.c	modified	+14	−22	View file
sound/soc/tegra/tegra20_spdif.h	modified	+0	−1	View file
sound/soc/tegra/tegra30_i2s.c	modified	+43	−42	View file
sound/soc/tegra/tegra30_i2s.h	modified	+0	−1	View file
sound/soc/tegra/tegra_alc5632.c	modified	+14	−18	View file
sound/soc/tegra/tegra_pcm.c	modified	+115	−0	View file
sound/soc/tegra/tegra_pcm.h	modified	+2	−0	View file
sound/soc/tegra/tegra_wm8753.c	modified	+4	−4	View file
sound/soc/tegra/tegra_wm8903.c	modified	+88	−171	View file
sound/soc/tegra/trimslice.c	modified	+7	−23	View file
sound/soc/ux500/Kconfig	modified	+18	−0	View file
sound/soc/ux500/Makefile	modified	+6	−0	View file
sound/soc/ux500/mop500.c	added	+113	−0	View file
sound/soc/ux500/mop500_ab8500.c	added	+431	−0	View file
sound/soc/ux500/mop500_ab8500.h	added	+22	−0	View file
sound/soc/ux500/ux500_msp_dai.c	modified	+1	−1	View file
sound/soc/ux500/ux500_msp_i2s.c	modified	+1	−1	View file
sound/soc/ux500/ux500_pcm.c	added	+318	−0	View file
sound/soc/ux500/ux500_pcm.h	added	+35	−0	View file
sound/usb/caiaq/device.c	modified	+1	−1	View file
sound/usb/mixer_quirks.c	modified	+103	−56	View file

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

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 221b810..4e4d0bc 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -875,8 +875,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     		setup before initializing the codecs.  This option is
 		available only when CONFIG_SND_HDA_PATCH_LOADER=y is set.
 		See HD-Audio.txt for details.
-    beep_mode	- Selects the beep registration mode (0=off, 1=on, 2=
-		dynamic registration via mute switch on/off); the default
+    beep_mode	- Selects the beep registration mode (0=off, 1=on); default
 		value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig.
     
     [Single (global) options]

Documentation/sound/alsa/HD-Audio-Models.txt

View file

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 03f7897..7456360 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -15,19 +15,24 @@ ALC260
 
 ALC262
 ======
-  N/A
+  inv-dmic	Inverted internal mic workaround
 
 ALC267/268
 ==========
-  N/A
+  inv-dmic	Inverted internal mic workaround
 
-ALC269
+ALC269/270/275/276/280/282
 ======
   laptop-amic	Laptops with analog-mic input
   laptop-dmic	Laptops with digital-mic input
+  alc269-dmic	Enable ALC269(VA) digital mic workaround
+  alc271-dmic	Enable ALC271X digital mic workaround
+  inv-dmic	Inverted internal mic workaround
+  lenovo-dock   Enables docking station I/O for some Lenovos
 
 ALC662/663/272
 ==============
+  mario		Chromebook mario model fixup
   asus-mode1	ASUS
   asus-mode2	ASUS
   asus-mode3	ASUS
@@ -36,6 +41,7 @@ ALC662/663/272
   asus-mode6	ASUS
   asus-mode7	ASUS
   asus-mode8	ASUS
+  inv-dmic	Inverted internal mic workaround
 
 ALC680
 ======
@@ -46,6 +52,7 @@ ALC882/883/885/888/889
   acer-aspire-4930g	Acer Aspire 4930G/5930G/6530G/6930G/7730G
   acer-aspire-8930g	Acer Aspire 8330G/6935G
   acer-aspire		Acer Aspire others
+  inv-dmic	Inverted internal mic workaround
 
 ALC861/660
 ==========

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 0ed7048..8ae601c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6765,9 +6765,11 @@ F:	include/linux/tifm.h
 
 TI LM49xxx FAMILY ASoC CODEC DRIVERS
 M:	M R Swami Reddy <[email protected]>
+M:	Vishwas A Deshpande <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 F:	sound/soc/codecs/lm49453*
+F:	sound/soc/codecs/isabelle*
 
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:	Peter Ujfalusi <[email protected]>

arch/arm/mach-ux500/board-mop500.c

View file

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 84461fa..a310222 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -25,6 +25,7 @@
 #include <linux/mfd/tc3589x.h>
 #include <linux/mfd/tps6105x.h>
 #include <linux/mfd/abx500/ab8500-gpio.h>
+#include <linux/mfd/abx500/ab8500-codec.h>
 #include <linux/leds-lp5521.h>
 #include <linux/input.h>
 #include <linux/smsc911x.h>
@@ -97,6 +98,18 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = {
 					0x7A, 0x00, 0x00},
 };
 
+/* ab8500-codec */
+static struct ab8500_codec_platform_data ab8500_codec_pdata = {
+	.amics =  {
+		.mic1_type = AMIC_TYPE_DIFFERENTIAL,
+		.mic2_type = AMIC_TYPE_DIFFERENTIAL,
+		.mic1a_micbias = AMIC_MICBIAS_VAMIC1,
+		.mic1b_micbias = AMIC_MICBIAS_VAMIC1,
+		.mic2_micbias = AMIC_MICBIAS_VAMIC2
+	},
+	.ear_cmv = EAR_CMV_0_95V
+};
+
 static struct gpio_keys_button snowball_key_array[] = {
 	{
 		.gpio           = 32,
@@ -195,6 +208,7 @@ static struct ab8500_platform_data ab8500_platdata = {
 	.regulator	= ab8500_regulators,
 	.num_regulator	= ARRAY_SIZE(ab8500_regulators),
 	.gpio		= &ab8500_gpio_pdata,
+	.codec		= &ab8500_codec_pdata,
 };
 
 static struct resource ab8500_resources[] = {

include/linux/ac97_codec.h

View before deletion

diff --git a/include/linux/ac97_codec.h b/include/linux/ac97_codec.h
deleted file mode 100644
index 0260c3e..0000000
--- a/include/linux/ac97_codec.h
+++ /dev/null
@@ -1,362 +0,0 @@
-#ifndef _AC97_CODEC_H_
-#define _AC97_CODEC_H_
-
-#include <linux/types.h>
-#include <linux/soundcard.h>
-
-/* AC97 1.0 */
-#define  AC97_RESET               0x0000      //
-#define  AC97_MASTER_VOL_STEREO   0x0002      // Line Out
-#define  AC97_HEADPHONE_VOL       0x0004      // 
-#define  AC97_MASTER_VOL_MONO     0x0006      // TAD Output
-#define  AC97_MASTER_TONE         0x0008      //
-#define  AC97_PCBEEP_VOL          0x000a      // none
-#define  AC97_PHONE_VOL           0x000c      // TAD Input (mono)
-#define  AC97_MIC_VOL             0x000e      // MIC Input (mono)
-#define  AC97_LINEIN_VOL          0x0010      // Line Input (stereo)
-#define  AC97_CD_VOL              0x0012      // CD Input (stereo)
-#define  AC97_VIDEO_VOL           0x0014      // none
-#define  AC97_AUX_VOL             0x0016      // Aux Input (stereo)
-#define  AC97_PCMOUT_VOL          0x0018      // Wave Output (stereo)
-#define  AC97_RECORD_SELECT       0x001a      //
-#define  AC97_RECORD_GAIN         0x001c
-#define  AC97_RECORD_GAIN_MIC     0x001e
-#define  AC97_GENERAL_PURPOSE     0x0020
-#define  AC97_3D_CONTROL          0x0022
-#define  AC97_MODEM_RATE          0x0024
-#define  AC97_POWER_CONTROL       0x0026
-
-/* AC'97 2.0 */
-#define AC97_EXTENDED_ID          0x0028       /* Extended Audio ID */
-#define AC97_EXTENDED_STATUS      0x002A       /* Extended Audio Status */
-#define AC97_PCM_FRONT_DAC_RATE   0x002C       /* PCM Front DAC Rate */
-#define AC97_PCM_SURR_DAC_RATE    0x002E       /* PCM Surround DAC Rate */
-#define AC97_PCM_LFE_DAC_RATE     0x0030       /* PCM LFE DAC Rate */
-#define AC97_PCM_LR_ADC_RATE      0x0032       /* PCM LR ADC Rate */
-#define AC97_PCM_MIC_ADC_RATE     0x0034       /* PCM MIC ADC Rate */
-#define AC97_CENTER_LFE_MASTER    0x0036       /* Center + LFE Master Volume */
-#define AC97_SURROUND_MASTER      0x0038       /* Surround (Rear) Master Volume */
-#define AC97_RESERVED_3A          0x003A       /* Reserved in AC '97 < 2.2 */
-
-/* AC'97 2.2 */
-#define AC97_SPDIF_CONTROL        0x003A       /* S/PDIF Control */
-
-/* range 0x3c-0x58 - MODEM */
-#define AC97_EXTENDED_MODEM_ID    0x003C
-#define AC97_EXTEND_MODEM_STAT    0x003E
-#define AC97_LINE1_RATE           0x0040
-#define AC97_LINE2_RATE           0x0042
-#define AC97_HANDSET_RATE         0x0044
-#define AC97_LINE1_LEVEL          0x0046
-#define AC97_LINE2_LEVEL          0x0048
-#define AC97_HANDSET_LEVEL        0x004A
-#define AC97_GPIO_CONFIG          0x004C
-#define AC97_GPIO_POLARITY        0x004E
-#define AC97_GPIO_STICKY          0x0050
-#define AC97_GPIO_WAKE_UP         0x0052
-#define AC97_GPIO_STATUS          0x0054
-#define AC97_MISC_MODEM_STAT      0x0056
-#define AC97_RESERVED_58          0x0058
-
-/* registers 0x005a - 0x007a are vendor reserved */
-
-#define AC97_VENDOR_ID1           0x007c
-#define AC97_VENDOR_ID2           0x007e
-
-/* volume control bit defines */
-#define AC97_MUTE                 0x8000
-#define AC97_MICBOOST             0x0040
-#define AC97_LEFTVOL              0x3f00
-#define AC97_RIGHTVOL             0x003f
-
-/* record mux defines */
-#define AC97_RECMUX_MIC           0x0000
-#define AC97_RECMUX_CD            0x0101
-#define AC97_RECMUX_VIDEO         0x0202
-#define AC97_RECMUX_AUX           0x0303
-#define AC97_RECMUX_LINE          0x0404
-#define AC97_RECMUX_STEREO_MIX    0x0505
-#define AC97_RECMUX_MONO_MIX      0x0606
-#define AC97_RECMUX_PHONE         0x0707
-
-/* general purpose register bit defines */
-#define AC97_GP_LPBK              0x0080       /* Loopback mode */
-#define AC97_GP_MS                0x0100       /* Mic Select 0=Mic1, 1=Mic2 */
-#define AC97_GP_MIX               0x0200       /* Mono output select 0=Mix, 1=Mic */
-#define AC97_GP_RLBK              0x0400       /* Remote Loopback - Modem line codec */
-#define AC97_GP_LLBK              0x0800       /* Local Loopback - Modem Line codec */
-#define AC97_GP_LD                0x1000       /* Loudness 1=on */
-#define AC97_GP_3D                0x2000       /* 3D Enhancement 1=on */
-#define AC97_GP_ST                0x4000       /* Stereo Enhancement 1=on */
-#define AC97_GP_POP               0x8000       /* Pcm Out Path, 0=pre 3D, 1=post 3D */
-
-/* extended audio status and control bit defines */
-#define AC97_EA_VRA               0x0001       /* Variable bit rate enable bit */
-#define AC97_EA_DRA               0x0002       /* Double-rate audio enable bit */
-#define AC97_EA_SPDIF             0x0004       /* S/PDIF Enable bit */
-#define AC97_EA_VRM               0x0008       /* Variable bit rate for MIC enable bit */
-#define AC97_EA_CDAC              0x0040       /* PCM Center DAC is ready (Read only) */
-#define AC97_EA_SDAC              0x0040       /* PCM Surround DACs are ready (Read only) */
-#define AC97_EA_LDAC              0x0080       /* PCM LFE DAC is ready (Read only) */
-#define AC97_EA_MDAC              0x0100       /* MIC ADC is ready (Read only) */
-#define AC97_EA_SPCV              0x0400       /* S/PDIF configuration valid (Read only) */
-#define AC97_EA_PRI               0x0800       /* Turns the PCM Center DAC off */
-#define AC97_EA_PRJ               0x1000       /* Turns the PCM Surround DACs off */
-#define AC97_EA_PRK               0x2000       /* Turns the PCM LFE DAC off */
-#define AC97_EA_PRL               0x4000       /* Turns the MIC ADC off */
-#define AC97_EA_SLOT_MASK         0xffcf       /* Mask for slot assignment bits */
-#define AC97_EA_SPSA_3_4          0x0000       /* Slot assigned to 3 & 4 */
-#define AC97_EA_SPSA_7_8          0x0010       /* Slot assigned to 7 & 8 */
-#define AC97_EA_SPSA_6_9          0x0020       /* Slot assigned to 6 & 9 */
-#define AC97_EA_SPSA_10_11        0x0030       /* Slot assigned to 10 & 11 */
-
-/* S/PDIF control bit defines */
-#define AC97_SC_PRO               0x0001       /* Professional status */
-#define AC97_SC_NAUDIO            0x0002       /* Non audio stream */
-#define AC97_SC_COPY              0x0004       /* Copyright status */
-#define AC97_SC_PRE               0x0008       /* Preemphasis status */
-#define AC97_SC_CC_MASK           0x07f0       /* Category Code mask */
-#define AC97_SC_L                 0x0800       /* Generation Level status */
-#define AC97_SC_SPSR_MASK         0xcfff       /* S/PDIF Sample Rate bits */
-#define AC97_SC_SPSR_44K          0x0000       /* Use 44.1kHz Sample rate */
-#define AC97_SC_SPSR_48K          0x2000       /* Use 48kHz Sample rate */
-#define AC97_SC_SPSR_32K          0x3000       /* Use 32kHz Sample rate */
-#define AC97_SC_DRS               0x4000       /* Double Rate S/PDIF */
-#define AC97_SC_V                 0x8000       /* Validity status */
-
-/* powerdown control and status bit defines */
-
-/* status */
-#define AC97_PWR_MDM              0x0010       /* Modem section ready */
-#define AC97_PWR_REF              0x0008       /* Vref nominal */
-#define AC97_PWR_ANL              0x0004       /* Analog section ready */
-#define AC97_PWR_DAC              0x0002       /* DAC section ready */
-#define AC97_PWR_ADC              0x0001       /* ADC section ready */
-
-/* control */
-#define AC97_PWR_PR0              0x0100       /* ADC and Mux powerdown */
-#define AC97_PWR_PR1              0x0200       /* DAC powerdown */
-#define AC97_PWR_PR2              0x0400       /* Output mixer powerdown (Vref on) */
-#define AC97_PWR_PR3              0x0800       /* Output mixer powerdown (Vref off) */
-#define AC97_PWR_PR4              0x1000       /* AC-link powerdown */
-#define AC97_PWR_PR5              0x2000       /* Internal Clk disable */
-#define AC97_PWR_PR6              0x4000       /* HP amp powerdown */
-#define AC97_PWR_PR7              0x8000       /* Modem off - if supported */
-
-/* extended audio ID register bit defines */
-#define AC97_EXTID_VRA            0x0001
-#define AC97_EXTID_DRA            0x0002
-#define AC97_EXTID_SPDIF          0x0004
-#define AC97_EXTID_VRM            0x0008
-#define AC97_EXTID_DSA0           0x0010
-#define AC97_EXTID_DSA1           0x0020
-#define AC97_EXTID_CDAC           0x0040
-#define AC97_EXTID_SDAC           0x0080
-#define AC97_EXTID_LDAC           0x0100
-#define AC97_EXTID_AMAP           0x0200
-#define AC97_EXTID_REV0           0x0400
-#define AC97_EXTID_REV1           0x0800
-#define AC97_EXTID_ID0            0x4000
-#define AC97_EXTID_ID1            0x8000
-
-/* extended status register bit defines */
-#define AC97_EXTSTAT_VRA          0x0001
-#define AC97_EXTSTAT_DRA          0x0002
-#define AC97_EXTSTAT_SPDIF        0x0004
-#define AC97_EXTSTAT_VRM          0x0008
-#define AC97_EXTSTAT_SPSA0        0x0010
-#define AC97_EXTSTAT_SPSA1        0x0020
-#define AC97_EXTSTAT_CDAC         0x0040
-#define AC97_EXTSTAT_SDAC         0x0080
-#define AC97_EXTSTAT_LDAC         0x0100
-#define AC97_EXTSTAT_MADC         0x0200
-#define AC97_EXTSTAT_SPCV         0x0400
-#define AC97_EXTSTAT_PRI          0x0800
-#define AC97_EXTSTAT_PRJ          0x1000
-#define AC97_EXTSTAT_PRK          0x2000
-#define AC97_EXTSTAT_PRL          0x4000
-
-/* extended audio ID register bit defines */
-#define AC97_EXTID_VRA            0x0001
-#define AC97_EXTID_DRA            0x0002
-#define AC97_EXTID_SPDIF          0x0004
-#define AC97_EXTID_VRM            0x0008
-#define AC97_EXTID_DSA0           0x0010
-#define AC97_EXTID_DSA1           0x0020
-#define AC97_EXTID_CDAC           0x0040
-#define AC97_EXTID_SDAC           0x0080
-#define AC97_EXTID_LDAC           0x0100
-#define AC97_EXTID_AMAP           0x0200
-#define AC97_EXTID_REV0           0x0400
-#define AC97_EXTID_REV1           0x0800
-#define AC97_EXTID_ID0            0x4000
-#define AC97_EXTID_ID1            0x8000
-
-/* extended status register bit defines */
-#define AC97_EXTSTAT_VRA          0x0001
-#define AC97_EXTSTAT_DRA          0x0002
-#define AC97_EXTSTAT_SPDIF        0x0004
-#define AC97_EXTSTAT_VRM          0x0008
-#define AC97_EXTSTAT_SPSA0        0x0010
-#define AC97_EXTSTAT_SPSA1        0x0020
-#define AC97_EXTSTAT_CDAC         0x0040
-#define AC97_EXTSTAT_SDAC         0x0080
-#define AC97_EXTSTAT_LDAC         0x0100
-#define AC97_EXTSTAT_MADC         0x0200
-#define AC97_EXTSTAT_SPCV         0x0400
-#define AC97_EXTSTAT_PRI          0x0800
-#define AC97_EXTSTAT_PRJ          0x1000
-#define AC97_EXTSTAT_PRK          0x2000
-#define AC97_EXTSTAT_PRL          0x4000
-
-/* useful power states */
-#define AC97_PWR_D0               0x0000      /* everything on */
-#define AC97_PWR_D1              AC97_PWR_PR0|AC97_PWR_PR1|AC97_PWR_PR4
-#define AC97_PWR_D2              AC97_PWR_PR0|AC97_PWR_PR1|AC97_PWR_PR2|AC97_PWR_PR3|AC97_PWR_PR4
-#define AC97_PWR_D3              AC97_PWR_PR0|AC97_PWR_PR1|AC97_PWR_PR2|AC97_PWR_PR3|AC97_PWR_PR4
-#define AC97_PWR_ANLOFF          AC97_PWR_PR2|AC97_PWR_PR3  /* analog section off */
-
-/* Total number of defined registers.  */
-#define AC97_REG_CNT 64
-
-
-/* OSS interface to the ac97s.. */
-#define AC97_STEREO_MASK (SOUND_MASK_VOLUME|SOUND_MASK_PCM|\
-	SOUND_MASK_LINE|SOUND_MASK_CD|\
-	SOUND_MASK_ALTPCM|SOUND_MASK_IGAIN|\
-	SOUND_MASK_LINE1|SOUND_MASK_VIDEO)
-
-#define AC97_SUPPORTED_MASK (AC97_STEREO_MASK | \
-	SOUND_MASK_BASS|SOUND_MASK_TREBLE|\
-	SOUND_MASK_SPEAKER|SOUND_MASK_MIC|\
-	SOUND_MASK_PHONEIN|SOUND_MASK_PHONEOUT)
-
-#define AC97_RECORD_MASK (SOUND_MASK_MIC|\
-	SOUND_MASK_CD|SOUND_MASK_IGAIN|SOUND_MASK_VIDEO|\
-	SOUND_MASK_LINE1| SOUND_MASK_LINE|\
-	SOUND_MASK_PHONEIN)
-
-/* original check is not good enough in case FOO is greater than
- * SOUND_MIXER_NRDEVICES because the supported_mixers has exactly
- * SOUND_MIXER_NRDEVICES elements.
- * before matching the given mixer against the bitmask in supported_mixers we
- * check if mixer number exceeds maximum allowed size which is as mentioned
- * above SOUND_MIXER_NRDEVICES */
-#define supported_mixer(CODEC,FOO) ((FOO >= 0) && \
-                                    (FOO < SOUND_MIXER_NRDEVICES) && \
-                                    (CODEC)->supported_mixers & (1<<FOO) )
-
-struct ac97_codec {
-	/* Linked list of codecs */
-	struct list_head list;
-
-	/* AC97 controller connected with */
-	void *private_data;
-
-	char *name;
-	int id;
-	int dev_mixer; 
-	int type;
-	u32 model;
-
-	unsigned int modem:1;
-
-	struct ac97_ops *codec_ops;
-
-	/* controller specific lower leverl ac97 accessing routines.
-	   must be re-entrant safe */
-	u16  (*codec_read)  (struct ac97_codec *codec, u8 reg);
-	void (*codec_write) (struct ac97_codec *codec, u8 reg, u16 val);
-
-	/* Wait for codec-ready.  Ok to sleep here.  */
-	void  (*codec_wait)  (struct ac97_codec *codec);
-
-	/* callback used by helper drivers for interesting ac97 setups */
-	void  (*codec_unregister) (struct ac97_codec *codec);
-	
-	struct ac97_driver *driver;
-	void *driver_private;	/* Private data for the driver */
-	
-	spinlock_t lock;
-	
-	/* OSS mixer masks */
-	int modcnt;
-	int supported_mixers;
-	int stereo_mixers;
-	int record_sources;
-
-	/* Property flags */
-	int flags;
-
-	int bit_resolution;
-
-	/* OSS mixer interface */
-	int  (*read_mixer) (struct ac97_codec *codec, int oss_channel);
-	void (*write_mixer)(struct ac97_codec *codec, int oss_channel,
-			    unsigned int left, unsigned int right);
-	int  (*recmask_io) (struct ac97_codec *codec, int rw, int mask);
-	int  (*mixer_ioctl)(struct ac97_codec *codec, unsigned int cmd, unsigned long arg);
-
-	/* saved OSS mixer states */
-	unsigned int mixer_state[SOUND_MIXER_NRDEVICES];
-
-	/* Software Modem interface */
-	int  (*modem_ioctl)(struct ac97_codec *codec, unsigned int cmd, unsigned long arg);
-};
-
-/*
- *	Operation structures for each known AC97 chip
- */
- 
-struct ac97_ops
-{
-	/* Initialise */
-	int (*init)(struct ac97_codec *c);
-	/* Amplifier control */
-	int (*amplifier)(struct ac97_codec *codec, int on);
-	/* Digital mode control */
-	int (*digital)(struct ac97_codec *codec, int slots, int rate, int mode);
-#define AUDIO_DIGITAL		0x8000
-#define AUDIO_PRO		0x4000
-#define AUDIO_DRS		0x2000
-#define AUDIO_CCMASK		0x003F
-	
-#define AC97_DELUDED_MODEM	1	/* Audio codec reports its a modem */
-#define AC97_NO_PCM_VOLUME	2	/* Volume control is missing 	   */
-#define AC97_DEFAULT_POWER_OFF 4 /* Needs warm reset to power up */
-};
-
-extern int ac97_probe_codec(struct ac97_codec *);
-
-extern struct ac97_codec *ac97_alloc_codec(void);
-extern void ac97_release_codec(struct ac97_codec *codec);
-
-struct ac97_driver {
-	struct list_head list;
-	char *name;
-	u32 codec_id;
-	u32 codec_mask;
-	int (*probe) (struct ac97_codec *codec, struct ac97_driver *driver);
-	void (*remove) (struct ac97_codec *codec, struct ac97_driver *driver);
-};
-
-/* quirk types */
-enum {
-	AC97_TUNE_DEFAULT = -1, /* use default from quirk list (not valid in list) */
-	AC97_TUNE_NONE = 0,     /* nothing extra to do */
-	AC97_TUNE_HP_ONLY,      /* headphone (true line-out) control as master only */
-	AC97_TUNE_SWAP_HP,      /* swap headphone and master controls */
-	AC97_TUNE_SWAP_SURROUND, /* swap master and surround controls */
-	AC97_TUNE_AD_SHARING,   /* for AD1985, turn on OMS bit and use headphone */
-	AC97_TUNE_ALC_JACK,     /* for Realtek, enable JACK detection */
-};
-
-struct ac97_quirk {
-	unsigned short vendor;  /* PCI vendor id */
-	unsigned short device;  /* PCI device id */
-	unsigned short mask;    /* device id bit mask, 0 = accept all */
-	const char *name;       /* name shown as info */
-	int type;               /* quirk type above */
-};
-
-#endif /* _AC97_CODEC_H_ */

include/linux/dmaengine.h

View file

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 56377df..cc0756a 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -670,6 +670,12 @@ static inline int dmaengine_resume(struct dma_chan *chan)
 	return dmaengine_device_control(chan, DMA_RESUME, 0);
 }
 
+static inline enum dma_status dmaengine_tx_status(struct dma_chan *chan,
+	dma_cookie_t cookie, struct dma_tx_state *state)
+{
+	return chan->device->device_tx_status(chan, cookie, state);
+}
+
 static inline dma_cookie_t dmaengine_submit(struct dma_async_tx_descriptor *desc)
 {
 	return desc->tx_submit(desc);

include/linux/mfd/abx500/ab8500-codec.h

View file

diff --git a/include/linux/mfd/abx500/ab8500-codec.h b/include/linux/mfd/abx500/ab8500-codec.h
new file mode 100644
index 0000000..dc65292
--- /dev/null
+++ b/include/linux/mfd/abx500/ab8500-codec.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2012
+ *
+ * Author: Ola Lilja <[email protected]>
+ *         for ST-Ericsson.
+ *
+ * License terms:
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef AB8500_CORE_CODEC_H
+#define AB8500_CORE_CODEC_H
+
+/* Mic-types */
+enum amic_type {
+	AMIC_TYPE_SINGLE_ENDED,
+	AMIC_TYPE_DIFFERENTIAL
+};
+
+/* Mic-biases */
+enum amic_micbias {
+	AMIC_MICBIAS_VAMIC1,
+	AMIC_MICBIAS_VAMIC2
+};
+
+/* Bias-voltage */
+enum ear_cm_voltage {
+	EAR_CMV_0_95V,
+	EAR_CMV_1_10V,
+	EAR_CMV_1_27V,
+	EAR_CMV_1_58V
+};
+
+/* Analog microphone settings */
+struct amic_settings {
+	enum amic_type mic1_type;
+	enum amic_type mic2_type;
+	enum amic_micbias mic1a_micbias;
+	enum amic_micbias mic1b_micbias;
+	enum amic_micbias mic2_micbias;
+};
+
+/* Platform data structure for the audio-parts of the AB8500 */
+struct ab8500_codec_platform_data {
+	struct amic_settings amics;
+	enum ear_cm_voltage ear_cmv;
+};
+
+#endif

include/linux/mfd/abx500/ab8500.h

View file

diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 91dd3ef..bc9b84b 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -266,6 +266,7 @@ struct ab8500 {
 struct regulator_reg_init;
 struct regulator_init_data;
 struct ab8500_gpio_platform_data;
+struct ab8500_codec_platform_data;
 
 /**
  * struct ab8500_platform_data - AB8500 platform data
@@ -284,6 +285,7 @@ struct ab8500_platform_data {
 	int num_regulator;
 	struct regulator_init_data *regulator;
 	struct ab8500_gpio_platform_data *gpio;
+	struct ab8500_codec_platform_data *codec;
 };
 
 extern int __devinit ab8500_init(struct ab8500 *ab8500,

include/linux/platform_data/mmp_audio.h

View file

diff --git a/include/linux/platform_data/mmp_audio.h b/include/linux/platform_data/mmp_audio.h
new file mode 100644
index 0000000..0f25d16
--- /dev/null
+++ b/include/linux/platform_data/mmp_audio.h
@@ -0,0 +1,22 @@
+/*
+ *  MMP Platform AUDIO Management
+ *
+ *  Copyright (c) 2011 Marvell Semiconductors Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+
+#ifndef MMP_AUDIO_H
+#define MMP_AUDIO_H
+