forked from Minki/linux
2e341ca686
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 the 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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iQIcBAABAgAGBQJPvD/9AAoJEGwxgFQ9KSmkPsIP/AuBGpAZy7b7FiEEIy1Hhdws
US8WVuPzyDslMVdzZ8OFqyPXanIcL9gscoOGMZOEy7UFtMBiR4GuYiPRPubEMxuP
/gopUqK4SqIsIwT238qqYszSJSxE7gNEZ/2jhSGtkX4EkaSZ4bAskn0iOKX5uw2f
kTUQknA1rNLIGba2z6rJbgIW7hdxGfpFy05ruv3ct81nO+5JlgyLuP/v5R6jL+do
cum0N4dJFRd9YSEi2BG612gdz8LJyzOgPqBKmxMEva6BfqLkR8EdP80FtE3eEOiP
Et1q2LhZwOlBt0BEjsjjOVxMsgxVax6ps9cuNRTk5ECEOldU5dbDatC45L/e9mSD
OQVUjYAX1mQAtYva4U4PPn6WU6ma2L5yjy4peCObtyCMkEchXk1bfs4CEfVqCXUP
yFYN8C+y6osZOyWE3+Enn9ifZdWyLeSVq6CT33Yt+fyKlswp6gRkhKYiEPqTA5aU
p71X59Pp7q1y3tQwiMJNpf2QdkxuxfKURHswdc4BS9ct0mdZhQX0GyDS7OffkTd4
Lq5UkVMHA1rLlF9oRPd2C9P4BuMEuvLjf662YCKiw+mWFYdBC036DHLLjm1Hcwuj
UkpQ2PSrrdHG1u0c3ooZ9dQj1BNX4LoABLqvaMtce6sESD/hJ5gcprYJWvtituwM
ZzZiJavIWsoJ+SWQWBHe
=+JSm
-----END PGP SIGNATURE-----
Merge tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
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
...
183 lines
4.6 KiB
Plaintext
183 lines
4.6 KiB
Plaintext
config SND_SOC_FSL_SSI
|
|
tristate
|
|
|
|
config SND_SOC_FSL_UTILS
|
|
tristate
|
|
|
|
menuconfig SND_POWERPC_SOC
|
|
tristate "SoC Audio for Freescale PowerPC CPUs"
|
|
depends on FSL_SOC
|
|
help
|
|
Say Y or M if you want to add support for codecs attached to
|
|
the PowerPC CPUs.
|
|
|
|
if SND_POWERPC_SOC
|
|
|
|
config SND_MPC52xx_DMA
|
|
tristate
|
|
|
|
config SND_SOC_POWERPC_DMA
|
|
tristate
|
|
|
|
config SND_SOC_MPC8610_HPCD
|
|
tristate "ALSA SoC support for the Freescale MPC8610 HPCD board"
|
|
# I2C is necessary for the CS4270 driver
|
|
depends on MPC8610_HPCD && I2C
|
|
select SND_SOC_FSL_SSI
|
|
select SND_SOC_FSL_UTILS
|
|
select SND_SOC_POWERPC_DMA
|
|
select SND_SOC_CS4270
|
|
select SND_SOC_CS4270_VD33_ERRATA
|
|
default y if MPC8610_HPCD
|
|
help
|
|
Say Y if you want to enable audio on the Freescale MPC8610 HPCD.
|
|
|
|
config SND_SOC_P1022_DS
|
|
tristate "ALSA SoC support for the Freescale P1022 DS board"
|
|
# I2C is necessary for the WM8776 driver
|
|
depends on P1022_DS && I2C
|
|
select SND_SOC_FSL_SSI
|
|
select SND_SOC_FSL_UTILS
|
|
select SND_SOC_POWERPC_DMA
|
|
select SND_SOC_WM8776
|
|
default y if P1022_DS
|
|
help
|
|
Say Y if you want to enable audio on the Freescale P1022 DS board.
|
|
This will also include the Wolfson Microelectronics WM8776 codec
|
|
driver.
|
|
|
|
config SND_SOC_MPC5200_I2S
|
|
tristate "Freescale MPC5200 PSC in I2S mode driver"
|
|
depends on PPC_MPC52xx && PPC_BESTCOMM
|
|
select SND_MPC52xx_DMA
|
|
select PPC_BESTCOMM_GEN_BD
|
|
help
|
|
Say Y here to support the MPC5200 PSCs in I2S mode.
|
|
|
|
config SND_SOC_MPC5200_AC97
|
|
tristate "Freescale MPC5200 PSC in AC97 mode driver"
|
|
depends on PPC_MPC52xx && PPC_BESTCOMM
|
|
select SND_SOC_AC97_BUS
|
|
select SND_MPC52xx_DMA
|
|
select PPC_BESTCOMM_GEN_BD
|
|
help
|
|
Say Y here to support the MPC5200 PSCs in AC97 mode.
|
|
|
|
config SND_MPC52xx_SOC_PCM030
|
|
tristate "SoC AC97 Audio support for Phytec pcm030 and WM9712"
|
|
depends on PPC_MPC5200_SIMPLE
|
|
select SND_SOC_MPC5200_AC97
|
|
select SND_SOC_WM9712
|
|
help
|
|
Say Y if you want to add support for sound on the Phytec pcm030
|
|
baseboard.
|
|
|
|
config SND_MPC52xx_SOC_EFIKA
|
|
tristate "SoC AC97 Audio support for bbplan Efika and STAC9766"
|
|
depends on PPC_EFIKA
|
|
select SND_SOC_MPC5200_AC97
|
|
select SND_SOC_STAC9766
|
|
help
|
|
Say Y if you want to add support for sound on the Efika.
|
|
|
|
endif # SND_POWERPC_SOC
|
|
|
|
menuconfig SND_IMX_SOC
|
|
tristate "SoC Audio for Freescale i.MX CPUs"
|
|
depends on ARCH_MXC
|
|
help
|
|
Say Y or M if you want to add support for codecs attached to
|
|
the i.MX CPUs.
|
|
|
|
if SND_IMX_SOC
|
|
|
|
config SND_SOC_IMX_SSI
|
|
tristate
|
|
|
|
config SND_SOC_IMX_PCM
|
|
tristate
|
|
|
|
config SND_SOC_IMX_PCM_FIQ
|
|
tristate
|
|
select FIQ
|
|
select SND_SOC_IMX_PCM
|
|
|
|
config SND_SOC_IMX_PCM_DMA
|
|
tristate
|
|
select SND_SOC_DMAENGINE_PCM
|
|
select SND_SOC_IMX_PCM
|
|
|
|
config SND_SOC_IMX_AUDMUX
|
|
tristate
|
|
|
|
config SND_MXC_SOC_WM1133_EV1
|
|
tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
|
|
depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
|
|
select SND_SOC_WM8350
|
|
select SND_SOC_IMX_PCM_FIQ
|
|
select SND_SOC_IMX_AUDMUX
|
|
select SND_SOC_IMX_SSI
|
|
help
|
|
Enable support for audio on the i.MX31ADS with the WM1133-EV1
|
|
PMIC board with WM8835x fitted.
|
|
|
|
config SND_SOC_MX27VIS_AIC32X4
|
|
tristate "SoC audio support for Visstrim M10 boards"
|
|
depends on MACH_IMX27_VISSTRIM_M10 && I2C
|
|
select SND_SOC_TLV320AIC32X4
|
|
select SND_SOC_IMX_PCM_DMA
|
|
select SND_SOC_IMX_AUDMUX
|
|
select SND_SOC_IMX_SSI
|
|
help
|
|
Say Y if you want to add support for SoC audio on Visstrim SM10
|
|
board with TLV320AIC32X4 codec.
|
|
|
|
config SND_SOC_PHYCORE_AC97
|
|
tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
|
|
depends on MACH_PCM043 || MACH_PCA100
|
|
select SND_SOC_AC97_BUS
|
|
select SND_SOC_WM9712
|
|
select SND_SOC_IMX_PCM_FIQ
|
|
select SND_SOC_IMX_AUDMUX
|
|
select SND_SOC_IMX_SSI
|
|
help
|
|
Say Y if you want to add support for SoC audio on Phytec phyCORE
|
|
and phyCARD boards in AC97 mode
|
|
|
|
config SND_SOC_EUKREA_TLV320
|
|
tristate "Eukrea TLV320"
|
|
depends on MACH_EUKREA_MBIMX27_BASEBOARD \
|
|
|| MACH_EUKREA_MBIMXSD25_BASEBOARD \
|
|
|| MACH_EUKREA_MBIMXSD35_BASEBOARD \
|
|
|| MACH_EUKREA_MBIMXSD51_BASEBOARD
|
|
depends on I2C
|
|
select SND_SOC_TLV320AIC23
|
|
select SND_SOC_IMX_PCM_FIQ
|
|
select SND_SOC_IMX_AUDMUX
|
|
select SND_SOC_IMX_SSI
|
|
help
|
|
Enable I2S based access to the TLV320AIC23B codec attached
|
|
to the SSI interface
|
|
|
|
config SND_SOC_IMX_SGTL5000
|
|
tristate "SoC Audio support for i.MX boards with sgtl5000"
|
|
depends on OF && I2C
|
|
select SND_SOC_SGTL5000
|
|
select SND_SOC_IMX_PCM_DMA
|
|
select SND_SOC_IMX_AUDMUX
|
|
select SND_SOC_FSL_SSI
|
|
select SND_SOC_FSL_UTILS
|
|
help
|
|
Say Y if you want to add support for SoC audio on an i.MX board with
|
|
a sgtl5000 codec.
|
|
|
|
config SND_SOC_IMX_MC13783
|
|
tristate "SoC Audio support for I.MX boards with mc13783"
|
|
depends on MFD_MC13783
|
|
select SND_SOC_IMX_SSI
|
|
select SND_SOC_IMX_AUDMUX
|
|
select SND_SOC_MC13783
|
|
select SND_SOC_IMX_PCM_DMA
|
|
|
|
endif # SND_IMX_SOC
|