From a23dc694828e3de96bf18e20459ba885ba91cb29 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Fri, 16 Mar 2012 16:56:38 +0800 Subject: 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 Acked-by: Sascha Hauer Acked-by: Timur Tabi Signed-off-by: Mark Brown --- sound/soc/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'sound/soc/Kconfig') diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 91c985599d3..0f85f6d526e 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -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" -- cgit v1.2.3 From f2390880ec0264a0ed26b32c23bc23435b4297da Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Sun, 8 Apr 2012 21:17:50 -0700 Subject: ASoC: add generic simple-card support Current ASoC requires card.c file to each platforms in order to specifies its CPU and Codecs pair. But the differences between these were only value/strings of setting. In order to reduce duplicate driver, this patch adds generic/simple-card. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/Kconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sound/soc/Kconfig') diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 0f85f6d526e..a7df779894d 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -51,5 +51,8 @@ source "sound/soc/txx9/Kconfig" # Supported codecs source "sound/soc/codecs/Kconfig" +# generic frame-work +source "sound/soc/generic/Kconfig" + endif # SND_SOC -- cgit v1.2.3 From 3592b7f69a5438812381ff0aacdea1725ffa1c1c Mon Sep 17 00:00:00 2001 From: Ola Lilja Date: Tue, 8 May 2012 15:57:18 +0200 Subject: ASoC: Ux500: Add MSP I2S-driver Add driver for running I2S with the MSP-block. Signed-off-by: Ola Lilja [Fixed trailing whitespace -- broonie] Signed-off-by: Mark Brown --- sound/soc/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'sound/soc/Kconfig') diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index a7df779894d..40b2ad1bb1c 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -47,6 +47,7 @@ source "sound/soc/s6000/Kconfig" source "sound/soc/sh/Kconfig" source "sound/soc/tegra/Kconfig" source "sound/soc/txx9/Kconfig" +source "sound/soc/ux500/Kconfig" # Supported codecs source "sound/soc/codecs/Kconfig" -- cgit v1.2.3