On Mon, Mar 05, 2012 at 06:39:10PM +0100, Sascha Hauer wrote:
On Mon, Mar 05, 2012 at 10:30:58PM +0800, Shawn Guo wrote:
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
sound/soc/Kconfig | 1 - sound/soc/Makefile | 1 - sound/soc/fsl/Kconfig | 92 ++++++++++++++++++++++++++++++ sound/soc/fsl/Makefile | 22 +++++++ sound/soc/{imx => fsl}/eukrea-tlv320.c | 2 +- sound/soc/{imx => fsl}/imx-audmux.c | 0 sound/soc/{imx => fsl}/imx-audmux.h | 0 sound/soc/{imx => fsl}/imx-pcm-dma-mx2.c | 0
Maybe this is the right time to rename this file to something like imx-pcm-dma.c since it has nothing to do with mx2 anymore.
Ok, will change it in the next post.