From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/20] ASoC: fsl: separate SSI and DMA Kconfig options
Date: Sat, 3 Mar 2012 23:19:52 +0800 [thread overview]
Message-ID: <1330788001-10158-12-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1330788001-10158-1-git-send-email-shawn.guo@linaro.org>
The fsl_ssi driver will possibly be shared between Freescale PowerPC
and ARM/IMX families, so give it a separate Kconfig option. Then
fsl_ssi driver can possibly be selected independently from selecting
PowerPC DMA based PCM driver.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
sound/soc/fsl/Kconfig | 15 +++++++++------
sound/soc/fsl/Makefile | 3 ++-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index d754d34..ca693b2 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,10 +1,11 @@
config SND_MPC52xx_DMA
tristate
-# ASoC platform support for the Freescale PowerPC SOCs that have an SSI and
-# an Elo DMA controller, such as the MPC8610 and P1022. You will still need to
-# select a platform driver and a codec driver.
-config SND_SOC_POWERPC_SSI
+config SND_SOC_FSL_SSI
+ tristate
+ depends on FSL_SOC
+
+config SND_SOC_POWERPC_DMA
tristate
depends on FSL_SOC
@@ -12,7 +13,8 @@ config SND_SOC_MPC8610_HPCD
tristate "ALSA SoC support for the Freescale MPC8610 HPCD board"
# I2C is necessary for the CS4270 driver
depends on MPC8610_HPCD && I2C
- select SND_SOC_POWERPC_SSI
+ select SND_SOC_FSL_SSI
+ select SND_SOC_POWERPC_DMA
select SND_SOC_CS4270
select SND_SOC_CS4270_VD33_ERRATA
default y if MPC8610_HPCD
@@ -23,7 +25,8 @@ config SND_SOC_P1022_DS
tristate "ALSA SoC support for the Freescale P1022 DS board"
# I2C is necessary for the WM8776 driver
depends on P1022_DS && I2C
- select SND_SOC_POWERPC_SSI
+ select SND_SOC_FSL_SSI
+ select SND_SOC_POWERPC_DMA
select SND_SOC_WM8776
default y if P1022_DS
help
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index b4a38c0..95d483f 100644
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -9,7 +9,8 @@ obj-$(CONFIG_SND_SOC_P1022_DS) += snd-soc-p1022-ds.o
# Freescale PowerPC SSI/DMA Platform Support
snd-soc-fsl-ssi-objs := fsl_ssi.o
snd-soc-fsl-dma-objs := fsl_dma.o
-obj-$(CONFIG_SND_SOC_POWERPC_SSI) += snd-soc-fsl-ssi.o snd-soc-fsl-dma.o
+obj-$(CONFIG_SND_SOC_FSL_SSI) += snd-soc-fsl-ssi.o
+obj-$(CONFIG_SND_SOC_POWERPC_DMA) += snd-soc-fsl-dma.o
# MPC5200 Platform Support
obj-$(CONFIG_SND_MPC52xx_DMA) += mpc5200_dma.o
--
1.7.5.4
next prev parent reply other threads:[~2012-03-03 15:19 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-03 15:19 [PATCH 00/20] ASoC: add imx-sgtl5000 machine driver working with fsl_ssi Shawn Guo
2012-03-03 15:19 ` [PATCH 01/20] ASoC: imx: move eukrea audmux call into ASoC machine driver Shawn Guo
2012-03-03 15:19 ` [PATCH 02/20] ASoC: imx: move phycore " Shawn Guo
2012-03-03 15:19 ` [PATCH 03/20] ARM: imx: merge audmux-v1 and audmux-v2 Shawn Guo
2012-03-05 0:22 ` Tabi Timur-B04825
2012-03-05 7:33 ` Shawn Guo
2012-03-03 15:19 ` [PATCH 04/20] ARM: imx: convert audmux to a platform driver Shawn Guo
2012-03-04 19:00 ` Sascha Hauer
2012-03-05 7:35 ` Shawn Guo
2012-03-03 15:19 ` [PATCH 05/20] ASoC: imx: move audmux driver into sound/soc/imx Shawn Guo
2012-03-03 15:19 ` [PATCH 06/20] ASoC: imx: rename audmux prefix mxc to imx Shawn Guo
2012-03-03 15:19 ` [PATCH 07/20] ASoC: imx: move SND_SOC_AC97_BUS selection down to machine driver Shawn Guo
2012-03-04 13:34 ` Mark Brown
2012-03-03 15:19 ` [PATCH 08/20] ASoC: imx: initialize dma_params burstsize just in imx-ssi Shawn Guo
2012-03-04 13:26 ` Mark Brown
2012-03-03 15:19 ` [PATCH 09/20] ASoC: imx: separate imx-pcm bits from imx-ssi driver Shawn Guo
2012-03-04 13:41 ` Mark Brown
2012-03-03 15:19 ` [PATCH 10/20] ASoC: imx: add an explicit Kconfig option for " Shawn Guo
2012-03-03 15:19 ` Shawn Guo [this message]
2012-03-03 15:19 ` [PATCH 12/20] ASoC: imx: merge sound/soc/imx into sound/soc/fsl Shawn Guo
2012-03-03 15:19 ` [PATCH 13/20] ASoC: fsl: create fsl_utils to accommodate the common functions Shawn Guo
2012-03-03 15:19 ` [PATCH 14/20] ASoC: fsl: check property 'compatible' for the machine name Shawn Guo
2012-03-03 15:19 ` [PATCH 15/20] ASoC: fsl: make fsl_ssi driver compilable on ARM/IMX Shawn Guo
2012-03-04 23:13 ` Tabi Timur-B04825
2012-03-04 23:28 ` Russell King - ARM Linux
2012-03-04 23:32 ` Tabi Timur-B04825
2012-03-05 0:04 ` Russell King - ARM Linux
2012-03-05 0:13 ` Tabi Timur-B04825
2012-03-05 0:26 ` Mark Brown
2012-03-06 10:40 ` Russell King - ARM Linux
2012-03-06 12:06 ` Mark Brown
2012-03-06 12:25 ` Russell King - ARM Linux
2012-03-06 12:33 ` Mark Brown
2012-03-06 13:02 ` Tabi Timur-B04825
2012-03-06 13:03 ` Mark Brown
2012-03-06 13:26 ` [alsa-devel] " Takashi Iwai
2012-03-06 13:38 ` Mark Brown
2012-03-06 13:46 ` Takashi Iwai
2012-03-06 13:52 ` Russell King - ARM Linux
2012-03-06 16:54 ` Mark Brown
2012-03-06 13:46 ` Russell King - ARM Linux
2012-03-06 10:39 ` Russell King - ARM Linux
2012-03-05 7:39 ` Shawn Guo
2012-03-05 12:28 ` Tabi Timur-B04825
2012-03-05 13:40 ` Shawn Guo
2012-03-03 15:19 ` [PATCH 16/20] ASoC: fsl: remove the fatal error checking on codec-handle Shawn Guo
2012-03-03 15:19 ` [PATCH 17/20] ASoC: fsl: let fsl_ssi work with imx pcm and machine drivers Shawn Guo
2012-03-03 15:19 ` [PATCH 18/20] ASoC: fsl: add dt support for imx-audmux Shawn Guo
2012-03-03 15:20 ` [PATCH 19/20] ASoC: rename sgtl5000 device tree binding document Shawn Guo
2012-03-04 13:39 ` Mark Brown
2012-03-03 15:20 ` [PATCH 20/20] ASoC: fsl: add imx-sgtl5000 machine driver Shawn Guo
2012-03-04 13:38 ` Mark Brown
2012-03-05 8:06 ` Shawn Guo
2012-03-05 11:56 ` Mark Brown
2012-03-05 13:07 ` Shawn Guo
2012-03-05 13:13 ` Mark Brown
2012-03-05 16:55 ` [alsa-devel] " Stephen Warren
2012-03-05 17:03 ` Mark Brown
2012-03-06 18:19 ` Stephen Warren
2012-03-06 20:11 ` Mark Brown
2012-03-05 16:58 ` Timur Tabi
2012-03-05 17:32 ` Mark Brown
2012-03-04 23:34 ` Tabi Timur-B04825
2012-03-05 8:07 ` Shawn Guo
2012-03-04 13:32 ` [PATCH 00/20] ASoC: add imx-sgtl5000 machine driver working with fsl_ssi Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330788001-10158-12-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).