ASoC: imx: merge sound/soc/imx into sound/soc/fsl
authorShawn Guo <shawn.guo@linaro.org>
Fri, 16 Mar 2012 08:56:38 +0000 (16:56 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 1 Apr 2012 10:28:26 +0000 (11:28 +0100)
commita23dc694828e3de96bf18e20459ba885ba91cb29
tree26863bf2c6bdac975a369a20fcf6f47176c5cd55
parentd61e11260016f3589d60f94286c89ef823a26605
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>
33 files changed:
arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
arch/powerpc/configs/mpc85xx_defconfig
arch/powerpc/configs/mpc85xx_smp_defconfig
sound/soc/Kconfig
sound/soc/Makefile
sound/soc/fsl/Kconfig
sound/soc/fsl/Makefile
sound/soc/fsl/eukrea-tlv320.c [new file with mode: 0644]
sound/soc/fsl/imx-audmux.c [new file with mode: 0644]
sound/soc/fsl/imx-audmux.h [new file with mode: 0644]
sound/soc/fsl/imx-pcm-dma-mx2.c [new file with mode: 0644]
sound/soc/fsl/imx-pcm-fiq.c [new file with mode: 0644]
sound/soc/fsl/imx-pcm.c [new file with mode: 0644]
sound/soc/fsl/imx-pcm.h [new file with mode: 0644]
sound/soc/fsl/imx-ssi.c [new file with mode: 0644]
sound/soc/fsl/imx-ssi.h [new file with mode: 0644]
sound/soc/fsl/mx27vis-aic32x4.c [new file with mode: 0644]
sound/soc/fsl/phycore-ac97.c [new file with mode: 0644]
sound/soc/fsl/wm1133-ev1.c [new file with mode: 0644]
sound/soc/imx/Kconfig [deleted file]
sound/soc/imx/Makefile [deleted file]
sound/soc/imx/eukrea-tlv320.c [deleted file]
sound/soc/imx/imx-audmux.c [deleted file]
sound/soc/imx/imx-audmux.h [deleted file]
sound/soc/imx/imx-pcm-dma-mx2.c [deleted file]
sound/soc/imx/imx-pcm-fiq.c [deleted file]
sound/soc/imx/imx-pcm.c [deleted file]
sound/soc/imx/imx-pcm.h [deleted file]
sound/soc/imx/imx-ssi.c [deleted file]
sound/soc/imx/imx-ssi.h [deleted file]
sound/soc/imx/mx27vis-aic32x4.c [deleted file]
sound/soc/imx/phycore-ac97.c [deleted file]
sound/soc/imx/wm1133-ev1.c [deleted file]