* i.MX SSI Kconfig fixes
@ 2010-05-31 8:49 Sascha Hauer
2010-05-31 8:49 ` [PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS Sascha Hauer
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Sascha Hauer @ 2010-05-31 8:49 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Two small fixes for i.MX SSI.
Sascha
The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e:
Linux 2.6.35-rc1 (2010-05-30 13:21:02 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/imx/linux-2.6.git imx-ssi-fixes
Sascha Hauer (2):
i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS
i.MX ssi: Add missing Kconfig entry for Phytec boards
sound/soc/imx/Kconfig | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS
2010-05-31 8:49 i.MX SSI Kconfig fixes Sascha Hauer
@ 2010-05-31 8:49 ` Sascha Hauer
2010-05-31 10:12 ` Mark Brown
2010-05-31 8:49 ` Sascha Hauer
2010-05-31 9:40 ` i.MX SSI Kconfig fixes Liam Girdwood
2 siblings, 1 reply; 9+ messages in thread
From: Sascha Hauer @ 2010-05-31 8:49 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
sound/soc/imx/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index eba9b9d..11b4bcc 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -13,7 +13,7 @@ config SND_MXC_SOC_SSI
config SND_MXC_SOC_WM1133_EV1
tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
- depends on SND_IMX_SOC && EXPERIMENTAL
+ depends on SND_IMX_SOC && MACH_MX31ADS && EXPERIMENTAL
select SND_SOC_WM8350
select SND_MXC_SOC_SSI
help
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS
2010-05-31 8:49 ` [PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS Sascha Hauer
@ 2010-05-31 10:12 ` Mark Brown
2010-05-31 10:28 ` [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards Sascha Hauer
0 siblings, 1 reply; 9+ messages in thread
From: Mark Brown @ 2010-05-31 10:12 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 31, 2010 at 10:49:53AM +0200, Sascha Hauer wrote:
> config SND_MXC_SOC_WM1133_EV1
> tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
> - depends on SND_IMX_SOC && EXPERIMENTAL
> + depends on SND_IMX_SOC && MACH_MX31ADS && EXPERIMENTAL
This should depend on the 1133-EV1, not the core machine. The module
has a dependency on the core machine already and is required to use the
drivers.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards
2010-05-31 10:12 ` Mark Brown
@ 2010-05-31 10:28 ` Sascha Hauer
2010-05-31 10:30 ` Mark Brown
0 siblings, 1 reply; 9+ messages in thread
From: Sascha Hauer @ 2010-05-31 10:28 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
sound/soc/imx/Kconfig | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index 10acbe9..252defe 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -19,3 +19,12 @@ config SND_MXC_SOC_WM1133_EV1
help
Enable support for audio on the i.MX31ADS with the WM1133-EV1
PMIC board with WM8835x fitted.
+
+config SND_SOC_PHYCORE_AC97
+ tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
+ depends on MACH_PCM043 || MACH_PCA100
+ select SND_MXC_SOC_SSI
+ select SND_SOC_WM9712
+ help
+ Say Y if you want to add support for SoC audio on Phytec phyCORE
+ and phyCARD boards in AC97 mode
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards
2010-05-31 10:28 ` [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards Sascha Hauer
@ 2010-05-31 10:30 ` Mark Brown
2010-05-31 12:19 ` Sascha Hauer
0 siblings, 1 reply; 9+ messages in thread
From: Mark Brown @ 2010-05-31 10:30 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 31, 2010 at 12:28:21PM +0200, Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Is this different to your previous submission which I already have
queued for application?
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards
2010-05-31 10:30 ` Mark Brown
@ 2010-05-31 12:19 ` Sascha Hauer
2010-05-31 17:17 ` Mark Brown
0 siblings, 1 reply; 9+ messages in thread
From: Sascha Hauer @ 2010-05-31 12:19 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 31, 2010 at 11:30:46AM +0100, Mark Brown wrote:
> On Mon, May 31, 2010 at 12:28:21PM +0200, Sascha Hauer wrote:
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
>
> Is this different to your previous submission which I already have
> queued for application?
>
Sorry, wrong patch. I wanted to update the other patch according to your
comment. Here's the right one.
Sascha
[PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS_WM1133_EV1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
sound/soc/imx/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index eba9b9d..10acbe9 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -13,7 +13,7 @@ config SND_MXC_SOC_SSI
config SND_MXC_SOC_WM1133_EV1
tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
- depends on SND_IMX_SOC && EXPERIMENTAL
+ depends on SND_IMX_SOC && MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
select SND_SOC_WM8350
select SND_MXC_SOC_SSI
help
--
1.7.1
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards
2010-05-31 12:19 ` Sascha Hauer
@ 2010-05-31 17:17 ` Mark Brown
0 siblings, 0 replies; 9+ messages in thread
From: Mark Brown @ 2010-05-31 17:17 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 31, 2010 at 02:19:50PM +0200, Sascha Hauer wrote:
> Sorry, wrong patch. I wanted to update the other patch according to your
> comment. Here's the right one.
Applied both, but please do remember to submit patches in a form which
can be directly applied. For both patches I had to edit the subject
line and for this patch you'd just appeneded it to the body of a mail
message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards
2010-05-31 8:49 i.MX SSI Kconfig fixes Sascha Hauer
2010-05-31 8:49 ` [PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS Sascha Hauer
@ 2010-05-31 8:49 ` Sascha Hauer
2010-05-31 9:40 ` i.MX SSI Kconfig fixes Liam Girdwood
2 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2010-05-31 8:49 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
sound/soc/imx/Kconfig | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index 11b4bcc..b1b33e6 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -19,3 +19,12 @@ config SND_MXC_SOC_WM1133_EV1
help
Enable support for audio on the i.MX31ADS with the WM1133-EV1
PMIC board with WM8835x fitted.
+
+config SND_SOC_PHYCORE_AC97
+ tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
+ depends on MACH_PCM043 || MACH_PCA100
+ select SND_MXC_SOC_SSI
+ select SND_SOC_WM9712
+ help
+ Say Y if you want to add support for SoC audio on Phytec phyCORE
+ and phyCARD boards in AC97 mode
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* i.MX SSI Kconfig fixes
2010-05-31 8:49 i.MX SSI Kconfig fixes Sascha Hauer
2010-05-31 8:49 ` [PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS Sascha Hauer
2010-05-31 8:49 ` Sascha Hauer
@ 2010-05-31 9:40 ` Liam Girdwood
2 siblings, 0 replies; 9+ messages in thread
From: Liam Girdwood @ 2010-05-31 9:40 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 2010-05-31 at 10:49 +0200, Sascha Hauer wrote:
> Hi,
>
> Two small fixes for i.MX SSI.
>
> Sascha
>
> The following changes since commit 67a3e12b05e055c0415c556a315a3d3eb637e29e:
>
> Linux 2.6.35-rc1 (2010-05-30 13:21:02 -0700)
>
> are available in the git repository at:
> git://git.pengutronix.de/git/imx/linux-2.6.git imx-ssi-fixes
>
> Sascha Hauer (2):
> i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS
> i.MX ssi: Add missing Kconfig entry for Phytec boards
>
> sound/soc/imx/Kconfig | 11 ++++++++++-
> 1 files changed, 10 insertions(+), 1 deletions(-)
Both
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-05-31 17:17 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-31 8:49 i.MX SSI Kconfig fixes Sascha Hauer
2010-05-31 8:49 ` [PATCH 1/2] i.MX ssi: MX31ads sound support should depend on MACH_MX31ADS Sascha Hauer
2010-05-31 10:12 ` Mark Brown
2010-05-31 10:28 ` [PATCH 2/2] i.MX ssi: Add missing Kconfig entry for Phytec boards Sascha Hauer
2010-05-31 10:30 ` Mark Brown
2010-05-31 12:19 ` Sascha Hauer
2010-05-31 17:17 ` Mark Brown
2010-05-31 8:49 ` Sascha Hauer
2010-05-31 9:40 ` i.MX SSI Kconfig fixes Liam Girdwood
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).