[alsa-devel] i.MX SSI Kconfig fixes
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(-)
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
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.
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
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?
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
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.
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
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
participants (3)
-
Liam Girdwood -
Mark Brown -
Sascha Hauer