review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

author	Shawn Guo <shawn.guo@linaro.org>
	Fri, 16 Mar 2012 08:56:38 +0000 (16:56 +0800)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 1 Apr 2012 10:28:26 +0000 (11:28 +0100)
commit	a23dc694828e3de96bf18e20459ba885ba91cb29
tree	26863bf2c6bdac975a369a20fcf6f47176c5cd55	tree \| snapshot
parent	d61e11260016f3589d60f94286c89ef823a26605	commit \| diff

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>

21 files changed:

arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig		diff \| blob \| history
arch/powerpc/configs/mpc85xx_defconfig		diff \| blob \| history
arch/powerpc/configs/mpc85xx_smp_defconfig		diff \| blob \| history
sound/soc/Kconfig		diff \| blob \| history
sound/soc/Makefile		diff \| blob \| history
sound/soc/fsl/Kconfig		diff \| blob \| history
sound/soc/fsl/Makefile		diff \| blob \| history
sound/soc/fsl/eukrea-tlv320.c	[moved from sound/soc/imx/eukrea-tlv320.c with 99% similarity]	diff \| blob \| history
sound/soc/fsl/imx-audmux.c	[moved from sound/soc/imx/imx-audmux.c with 100% similarity]	blob \| history
sound/soc/fsl/imx-audmux.h	[moved from sound/soc/imx/imx-audmux.h with 100% similarity]	blob \| history
sound/soc/fsl/imx-pcm-dma-mx2.c	[moved from sound/soc/imx/imx-pcm-dma-mx2.c with 100% similarity]	blob \| history
sound/soc/fsl/imx-pcm-fiq.c	[moved from sound/soc/imx/imx-pcm-fiq.c with 100% similarity]	blob \| history
sound/soc/fsl/imx-pcm.c	[moved from sound/soc/imx/imx-pcm.c with 100% similarity]	blob \| history
sound/soc/fsl/imx-pcm.h	[moved from sound/soc/imx/imx-pcm.h with 100% similarity]	blob \| history
sound/soc/fsl/imx-ssi.c	[moved from sound/soc/imx/imx-ssi.c with 99% similarity]	diff \| blob \| history
sound/soc/fsl/imx-ssi.h	[moved from sound/soc/imx/imx-ssi.h with 100% similarity]	blob \| history
sound/soc/fsl/mx27vis-aic32x4.c	[moved from sound/soc/imx/mx27vis-aic32x4.c with 100% similarity]	blob \| history
sound/soc/fsl/phycore-ac97.c	[moved from sound/soc/imx/phycore-ac97.c with 100% similarity]	blob \| history
sound/soc/fsl/wm1133-ev1.c	[moved from sound/soc/imx/wm1133-ev1.c with 100% similarity]	blob \| history
sound/soc/imx/Kconfig	[deleted file]	blob \| history
sound/soc/imx/Makefile	[deleted file]	blob \| history

Domain: System / Kernel;

RSS Atom