Commit a23dc694 authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d61e1126

arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/configs/mpc85xx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/powerpc/configs/mpc85xx_smp_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

sound/soc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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"

sound/soc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

CRA Git | Maintained and supported by SUSTech CRA and CCSE