ASoC: imx: merge sound/soc/imx into sound/soc/fsl
Freescale PowerPC and ARM/IMX families share the same SSI IP block. The patch merges sound/soc/imx into sound/soc/fsl, so that the possible code sharing and consolidation can happen. This is a plain merge, except that menuconfig SND_POWERPC_SOC is added in Kconfig for PowerPC platform as a correspondence to SND_IMX_SOC for IMX platform. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Shawn Guo
Mark Brown
Родитель
d61e112600
Коммит
a23dc69482
|
|
@ -100,6 +100,7 @@ CONFIG_SND_MIXER_OSS=y
|
|||
CONFIG_SND_PCM_OSS=y
|
||||
# CONFIG_SND_SUPPORT_OLD_API is not set
|
||||
CONFIG_SND_SOC=y
|
||||
CONFIG_SND_POWERPC_SOC=y
|
||||
CONFIG_RTC_CLASS=y
|
||||
CONFIG_RTC_DRV_CMOS=y
|
||||
CONFIG_EXT2_FS=y
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ CONFIG_SND_INTEL8X0=y
|
|||
# CONFIG_SND_PPC is not set
|
||||
# CONFIG_SND_USB is not set
|
||||
CONFIG_SND_SOC=y
|
||||
CONFIG_SND_POWERPC_SOC=y
|
||||
CONFIG_HID_A4TECH=y
|
||||
CONFIG_HID_APPLE=y
|
||||
CONFIG_HID_BELKIN=y
|
||||
|
|
|
|||
|
|
@ -142,6 +142,7 @@ CONFIG_SND_INTEL8X0=y
|
|||
# CONFIG_SND_PPC is not set
|
||||
# CONFIG_SND_USB is not set
|
||||
CONFIG_SND_SOC=y
|
||||
CONFIG_SND_POWERPC_SOC=y
|
||||
CONFIG_HID_A4TECH=y
|
||||
CONFIG_HID_APPLE=y
|
||||
CONFIG_HID_BELKIN=y
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ source "sound/soc/blackfin/Kconfig"
|
|||
source "sound/soc/davinci/Kconfig"
|
||||
source "sound/soc/ep93xx/Kconfig"
|
||||
source "sound/soc/fsl/Kconfig"
|
||||
source "sound/soc/imx/Kconfig"
|
||||
source "sound/soc/jz4740/Kconfig"
|
||||
source "sound/soc/nuc900/Kconfig"
|
||||
source "sound/soc/omap/Kconfig"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ obj-$(CONFIG_SND_SOC) += blackfin/
|
|||
obj-$(CONFIG_SND_SOC) += davinci/
|
||||
obj-$(CONFIG_SND_SOC) += ep93xx/
|
||||
obj-$(CONFIG_SND_SOC) += fsl/
|
||||
obj-$(CONFIG_SND_SOC) += imx/
|
||||
obj-$(CONFIG_SND_SOC) += jz4740/
|
||||
obj-$(CONFIG_SND_SOC) += mid-x86/
|
||||
obj-$(CONFIG_SND_SOC) += mxs/
|
||||
|
|
|
|||
|
|
@ -1,3 +1,15 @@
|
|||
config SND_SOC_FSL_SSI
|
||||
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
|
||||
|
||||
|
|
@ -68,3 +80,83 @@ config SND_MPC52xx_SOC_EFIKA
|
|||
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_MXC_SOC_FIQ
|
||||
tristate
|
||||
select FIQ
|
||||
select SND_SOC_IMX_PCM
|
||||
|
||||
config SND_MXC_SOC_MX2
|
||||
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 the i.MX31ADS with WM1133-EV1 fitted"
|
||||
depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
|
||||
select SND_SOC_WM8350
|
||||
select SND_MXC_SOC_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_MXC_SOC_MX2
|
||||
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_MXC_SOC_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_MXC_SOC_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
|
||||
|
||||
endif # SND_IMX_SOC
|
||||
|
|
|
|||
|
|
@ -21,3 +21,25 @@ obj-$(CONFIG_SND_SOC_MPC5200_AC97) += mpc5200_psc_ac97.o
|
|||
obj-$(CONFIG_SND_MPC52xx_SOC_PCM030) += pcm030-audio-fabric.o
|
||||
obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o
|
||||
|
||||
# i.MX Platform Support
|
||||
snd-soc-imx-ssi-objs := imx-ssi.o
|
||||
snd-soc-imx-audmux-objs := imx-audmux.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
|
||||
obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o
|
||||
snd-soc-imx-pcm-y := imx-pcm.o
|
||||
snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_FIQ) += imx-pcm-fiq.o
|
||||
snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_MX2) += imx-pcm-dma-mx2.o
|
||||
|
||||
# i.MX Machine Support
|
||||
snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
|
||||
snd-soc-phycore-ac97-objs := phycore-ac97.o
|
||||
snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o
|
||||
snd-soc-wm1133-ev1-objs := wm1133-ev1.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
|
||||
obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
|
||||
obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o
|
||||
obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
* which is Copyright 2009 Simtec Electronics
|
||||
* and on sound/soc/imx/phycore-ac97.c which is
|
||||
* Copyright 2009 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
* value. When we read the same register two times (and the register still
|
||||
* contains the same value) these status bits are not set. We work
|
||||
* around this by not polling these bits but only wait a fixed delay.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/clk.h>
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
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 SSI interface.
|
||||
|
||||
|
||||
if SND_IMX_SOC
|
||||
|
||||
config SND_SOC_IMX_SSI
|
||||
tristate
|
||||
|
||||
config SND_SOC_IMX_PCM
|
||||
tristate
|
||||
|
||||
config SND_MXC_SOC_FIQ
|
||||
tristate
|
||||
select FIQ
|
||||
select SND_SOC_IMX_PCM
|
||||
|
||||
config SND_MXC_SOC_MX2
|
||||
select SND_SOC_DMAENGINE_PCM
|
||||
tristate
|
||||
select SND_SOC_IMX_PCM
|
||||
|
||||
config SND_SOC_IMX_AUDMUX
|
||||
tristate
|
||||
|
||||
config SND_MXC_SOC_WM1133_EV1
|
||||
tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
|
||||
depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
|
||||
select SND_SOC_WM8350
|
||||
select SND_MXC_SOC_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_MXC_SOC_MX2
|
||||
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_MXC_SOC_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_MXC_SOC_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
|
||||
|
||||
endif # SND_IMX_SOC
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# i.MX Platform Support
|
||||
snd-soc-imx-ssi-objs := imx-ssi.o
|
||||
snd-soc-imx-audmux-objs := imx-audmux.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o
|
||||
obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o
|
||||
snd-soc-imx-pcm-y := imx-pcm.o
|
||||
snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_FIQ) += imx-pcm-fiq.o
|
||||
snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_MX2) += imx-pcm-dma-mx2.o
|
||||
|
||||
# i.MX Machine Support
|
||||
snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
|
||||
snd-soc-phycore-ac97-objs := phycore-ac97.o
|
||||
snd-soc-mx27vis-aic32x4-objs := mx27vis-aic32x4.o
|
||||
snd-soc-wm1133-ev1-objs := wm1133-ev1.o
|
||||
|
||||
obj-$(CONFIG_SND_SOC_EUKREA_TLV320) += snd-soc-eukrea-tlv320.o
|
||||
obj-$(CONFIG_SND_SOC_PHYCORE_AC97) += snd-soc-phycore-ac97.o
|
||||
obj-$(CONFIG_SND_SOC_MX27VIS_AIC32X4) += snd-soc-mx27vis-aic32x4.o
|
||||
obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o
|
||||
Загрузка…
Ссылка в новой задаче