From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] ASoC: fsl: separate SSI and DMA Kconfig options
Date: Thu, 23 Feb 2012 22:48:37 +0800 [thread overview]
Message-ID: <1330008519-3584-3-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1330008519-3584-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-02-23 14:48 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 6:47 [PATCH 1/4] ASoC: imx: let SND_MXC_SOC_FIQ select FIQ Shawn Guo
2012-02-23 6:47 ` [PATCH 2/4] ASoC: imx: move SND_SOC_AC97_BUS selection down to machine driver Shawn Guo
2012-02-23 6:47 ` [PATCH 3/4] ASoC: imx: initialize dma_params burstsize just in imx-ssi Shawn Guo
2012-02-23 6:47 ` [PATCH 4/4] ASoC: imx: separate imx-pcm bits from imx-ssi driver Shawn Guo
2012-02-23 14:48 ` [PATCH 0/4] ASoC: merge imx into fsl Shawn Guo
2012-02-23 14:48 ` [PATCH 1/4] ASoC: imx: add an explicit Kconfig option for imx-ssi driver Shawn Guo
2012-02-23 15:40 ` Timur Tabi
2012-02-24 1:28 ` Shawn Guo
2012-02-24 2:59 ` Tabi Timur-B04825
2012-02-24 3:37 ` Shawn Guo
2012-02-23 14:48 ` Shawn Guo [this message]
2012-02-23 14:48 ` [PATCH 3/4] ASoC: imx: merge sound/soc/imx into sound/soc/fsl Shawn Guo
2012-02-23 14:48 ` [PATCH 4/4] ASoC: fsl: make fsl_ssi driver compilable on ARM/IMX Shawn Guo
2012-02-23 15:24 ` Sergei Shtylyov
2012-02-23 15:44 ` Timur Tabi
2012-02-23 16:52 ` Russell King - ARM Linux
2012-02-23 17:04 ` Timur Tabi
2012-02-23 17:14 ` Russell King - ARM Linux
2012-02-23 19:01 ` [alsa-devel] " Trent Piepho
2012-02-24 21:29 ` Timur Tabi
2012-02-24 21:54 ` Russell King - ARM Linux
2012-02-24 22:00 ` Timur Tabi
2012-02-24 22:35 ` Russell King - ARM Linux
2012-02-24 23:05 ` Timur Tabi
2012-02-24 23:15 ` Russell King - ARM Linux
2012-02-24 23:22 ` Timur Tabi
2012-02-24 23:28 ` Russell King - ARM Linux
2012-02-24 23:38 ` Timur Tabi
2012-02-24 14:09 ` [PATCH 0/6] ASoC: a few cleanups on sound/soc/fsl Shawn Guo
2012-02-24 14:02 ` Mark Brown
2012-02-24 14:23 ` Shawn Guo
2012-02-24 14:17 ` Mark Brown
2012-02-24 23:21 ` Shawn Guo
2012-02-24 23:14 ` Timur Tabi
2012-02-25 0:03 ` Shawn Guo
2012-02-25 1:39 ` Tabi Timur-B04825
2012-02-25 10:17 ` Russell King - ARM Linux
2012-02-25 11:44 ` Mark Brown
2012-02-25 12:12 ` Russell King - ARM Linux
2012-02-25 13:58 ` Mark Brown
2012-02-25 12:16 ` Shawn Guo
2012-02-24 23:23 ` Russell King - ARM Linux
2012-02-25 0:06 ` Shawn Guo
2012-02-24 14:09 ` [PATCH 1/6] ASoC: fsl: correct get_dma_channel parameter name Shawn Guo
2012-02-27 20:27 ` Timur Tabi
2012-02-28 12:34 ` Mark Brown
2012-02-24 14:09 ` [PATCH 2/6] ASoC: fsl: align mpc8610_hpcd with p1022_ds on getting codec node Shawn Guo
2012-02-27 20:31 ` Timur Tabi
2012-02-28 12:35 ` Mark Brown
2012-02-24 14:09 ` [PATCH 3/6] ASoC: Remove unnecessary -codec from cs4270 driver name Shawn Guo
2012-02-27 21:21 ` Timur Tabi
2012-02-28 12:35 ` Mark Brown
2012-02-24 14:09 ` [PATCH 4/6] ASoC: fsl: create fsl_utils to accommodate the common functions Shawn Guo
2012-02-27 18:15 ` Timur Tabi
2012-02-27 21:36 ` Timur Tabi
2012-02-28 2:15 ` Shawn Guo
2012-02-28 2:15 ` Tabi Timur-B04825
2012-02-28 16:51 ` Timur Tabi
2012-02-24 14:09 ` [PATCH 5/6] ASoC: fsl: use platform_device_id table to match p1022_ds device Shawn Guo
2012-02-27 21:39 ` Timur Tabi
2012-02-27 21:39 ` Timur Tabi
2012-02-28 1:52 ` Shawn Guo
2012-02-24 14:09 ` [PATCH 6/6] ASoC: fsl: check property 'compatible' for the machine name Shawn Guo
2012-02-24 14:12 ` Mark Brown
2012-02-24 16:30 ` Timur Tabi
2012-02-25 0:09 ` Shawn Guo
2012-02-25 11:39 ` Mark Brown
2012-02-25 1:28 ` Shawn Guo
2012-02-25 11:42 ` Mark Brown
2012-02-25 13:09 ` Shawn Guo
2012-02-25 13:27 ` Mark Brown
2012-02-25 14:03 ` Tabi Timur-B04825
2012-02-24 16:32 ` Timur Tabi
2012-02-24 23:23 ` Shawn Guo
2012-02-24 23:22 ` Timur Tabi
2012-02-27 21:54 ` Timur Tabi
2012-02-28 1:50 ` Shawn Guo
2012-02-28 2:12 ` Tabi Timur-B04825
2012-02-28 3:13 ` Shawn Guo
2012-02-28 3:42 ` Tabi Timur-B04825
2012-02-28 5:35 ` Shawn Guo
2012-02-27 20:28 ` [PATCH 0/6] ASoC: a few cleanups on sound/soc/fsl Timur Tabi
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=1330008519-3584-3-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).