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>

1 files changed, 92 insertions, 0 deletions

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index ca693b2ed838..19856a05208c 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -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