mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 03:11:46 +00:00
93d7b7622c
This reverts commit 25b8d31488.
While the commit fixes multiple init_module definition error with
module build, it breaks build when both imx-pcm-fiq and imx-pcm-dma
are built in as below.
LD sound/soc/fsl/snd-soc-fsl-ssi.o
LD sound/soc/fsl/snd-soc-fsl-utils.o
LD sound/soc/fsl/snd-soc-imx-ssi.o
LD sound/soc/fsl/snd-soc-imx-audmux.o
LD sound/soc/fsl/snd-soc-imx-pcm-fiq.o
LD sound/soc/fsl/snd-soc-imx-pcm-dma.o
LD sound/soc/fsl/snd-soc-eukrea-tlv320.o
LD sound/soc/fsl/snd-soc-imx-sgtl5000.o
LD sound/soc/fsl/snd-soc-imx-mc13783.o
LD sound/soc/fsl/built-in.o
sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_free':
imx-pcm.c:(.text+0x464): multiple definition of `imx_pcm_free'
sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x1a8): first defined here
sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `snd_imx_pcm_mmap':
imx-pcm.c:(.text+0x35c): multiple definition of `snd_imx_pcm_mmap'
sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0xa0): first defined here
sound/soc/fsl/snd-soc-imx-pcm-dma.o: In function `imx_pcm_new':
imx-pcm.c:(.text+0x3dc): multiple definition of `imx_pcm_new'
sound/soc/fsl/snd-soc-imx-pcm-fiq.o:imx-pcm-fiq.c:(.text+0x120): first defined here
make[4]: *** [sound/soc/fsl/built-in.o] Error 1
Let's revert the commit and find a proper fix for multiple init_module
definition error later.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
197 lines
5.1 KiB
Plaintext
197 lines
5.1 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 || PPC_MPC52xx
|
|
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_P1022_RDK
|
|
tristate "ALSA SoC support for the Freescale / iVeia P1022 RDK board"
|
|
# I2C is necessary for the WM8960 driver
|
|
depends on P1022_RDK && I2C
|
|
select SND_SOC_FSL_SSI
|
|
select SND_SOC_FSL_UTILS
|
|
select SND_SOC_POWERPC_DMA
|
|
select SND_SOC_WM8960
|
|
default y if P1022_RDK
|
|
help
|
|
Say Y if you want to enable audio on the Freescale / iVeia
|
|
P1022 RDK board. This will also include the Wolfson
|
|
Microelectronics WM8960 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
|
|
bool
|
|
select FIQ
|
|
select SND_SOC_IMX_PCM
|
|
|
|
config SND_SOC_IMX_PCM_DMA
|
|
bool
|
|
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
|
|
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
|