[PATCH 1/2] alsa/soc: Fix typo in MPC5200 PSC AC97 driver Kconfig

[PATCH 1/2] alsa/soc: Fix typo in MPC5200 PSC AC97 driver Kconfig

[Grant Likely]

From: Grant Likely <grant.likely@secretlab.ca>

ALSA SoC drivers should be specify SND_SOC_AC97_BUS instead, not AC97_BUS.
Without SND_SOC_AC97_BUS defined, an AC97 device will not get correctly
registered on the AC97 bus, which prevents thinks like the WM9712
touchscreen driver from getting probed.

Tested against 2.6.31-rc1.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

 sound/soc/fsl/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 5dbebf8..5661876 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -33,7 +33,7 @@ config SND_SOC_MPC5200_I2S
 config SND_SOC_MPC5200_AC97
 	tristate "Freescale MPC5200 PSC in AC97 mode driver"
 	depends on PPC_MPC52xx && PPC_BESTCOMM
-	select AC97_BUS
+	select SND_SOC_AC97_BUS
 	select SND_MPC52xx_DMA
 	select PPC_BESTCOMM_GEN_BD
 	help

[PATCH 2/2] sound/soc: remove BROKEN from Efika and pcm030 fabric drivers

[Grant Likely]

From: Grant Likely <grant.likely@secretlab.ca>

The needed spin_event_timeout() macro is now merged in from the
powerpc tree, so these drivers are no longer broken.  This reverts
commit 0c0e09e21a9e7bc6ca54e06ef3d497255ca26383 (ASoC: Mark MPC5200
AC97 as BROKEN until PowerPC merge issues are resolved)

Tested against 2.6.31-rc1.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

 sound/soc/fsl/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 5661876..8cb65cc 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -41,7 +41,7 @@ config SND_SOC_MPC5200_AC97
 
 config SND_MPC52xx_SOC_PCM030
 	tristate "SoC AC97 Audio support for Phytec pcm030 and WM9712"
-	depends on PPC_MPC5200_SIMPLE && BROKEN
+	depends on PPC_MPC5200_SIMPLE
 	select SND_SOC_MPC5200_AC97
 	select SND_SOC_WM9712
 	help
@@ -50,7 +50,7 @@ config SND_MPC52xx_SOC_PCM030
 
 config SND_MPC52xx_SOC_EFIKA
 	tristate "SoC AC97 Audio support for bbplan Efika and STAC9766"
-	depends on PPC_EFIKA && BROKEN
+	depends on PPC_EFIKA
 	select SND_SOC_MPC5200_AC97
 	select SND_SOC_STAC9766
 	help

Re: [PATCH 2/2] sound/soc: remove BROKEN from Efika and pcm030 fabric drivers

[Jon Smirl]

On Sun, Jun 28, 2009 at 3:42 AM, Grant Likely<grant.likely@secretlab.ca> wr=
ote:
> From: Grant Likely <grant.likely@secretlab.ca>
>
> The needed spin_event_timeout() macro is now merged in from the
> powerpc tree, so these drivers are no longer broken. =A0This reverts
> commit 0c0e09e21a9e7bc6ca54e06ef3d497255ca26383 (ASoC: Mark MPC5200
> AC97 as BROKEN until PowerPC merge issues are resolved)
>
> Tested against 2.6.31-rc1.
>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Acked-by: Jon Smirl <jonsmirl@gmail.com>

> ---
>
> =A0sound/soc/fsl/Kconfig | =A0 =A04 ++--
> =A01 files changed, 2 insertions(+), 2 deletions(-)
>
>
> diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
> index 5661876..8cb65cc 100644
> --- a/sound/soc/fsl/Kconfig
> +++ b/sound/soc/fsl/Kconfig
> @@ -41,7 +41,7 @@ config SND_SOC_MPC5200_AC97
>
> =A0config SND_MPC52xx_SOC_PCM030
> =A0 =A0 =A0 =A0tristate "SoC AC97 Audio support for Phytec pcm030 and WM9=
712"
> - =A0 =A0 =A0 depends on PPC_MPC5200_SIMPLE && BROKEN
> + =A0 =A0 =A0 depends on PPC_MPC5200_SIMPLE
> =A0 =A0 =A0 =A0select SND_SOC_MPC5200_AC97
> =A0 =A0 =A0 =A0select SND_SOC_WM9712
> =A0 =A0 =A0 =A0help
> @@ -50,7 +50,7 @@ config SND_MPC52xx_SOC_PCM030
>
> =A0config SND_MPC52xx_SOC_EFIKA
> =A0 =A0 =A0 =A0tristate "SoC AC97 Audio support for bbplan Efika and STAC=
9766"
> - =A0 =A0 =A0 depends on PPC_EFIKA && BROKEN
> + =A0 =A0 =A0 depends on PPC_EFIKA
> =A0 =A0 =A0 =A0select SND_SOC_MPC5200_AC97
> =A0 =A0 =A0 =A0select SND_SOC_STAC9766
> =A0 =A0 =A0 =A0help
>
>



--=20
Jon Smirl
jonsmirl@gmail.com

Re: [PATCH 1/2] alsa/soc: Fix typo in MPC5200 PSC AC97 driver Kconfig

[Jon Smirl]

On Sun, Jun 28, 2009 at 3:41 AM, Grant Likely<grant.likely@secretlab.ca> wr=
ote:
> From: Grant Likely <grant.likely@secretlab.ca>
>
> ALSA SoC drivers should be specify SND_SOC_AC97_BUS instead, not AC97_BUS=
.
> Without SND_SOC_AC97_BUS defined, an AC97 device will not get correctly
> registered on the AC97 bus, which prevents thinks like the WM9712
> touchscreen driver from getting probed.
>
> Tested against 2.6.31-rc1.
>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Acked-by: Jon Smirl <jonsmirl@gmail.com>

> ---
>
> =A0sound/soc/fsl/Kconfig | =A0 =A02 +-
> =A01 files changed, 1 insertions(+), 1 deletions(-)
>
>
> diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
> index 5dbebf8..5661876 100644
> --- a/sound/soc/fsl/Kconfig
> +++ b/sound/soc/fsl/Kconfig
> @@ -33,7 +33,7 @@ config SND_SOC_MPC5200_I2S
> =A0config SND_SOC_MPC5200_AC97
> =A0 =A0 =A0 =A0tristate "Freescale MPC5200 PSC in AC97 mode driver"
> =A0 =A0 =A0 =A0depends on PPC_MPC52xx && PPC_BESTCOMM
> - =A0 =A0 =A0 select AC97_BUS
> + =A0 =A0 =A0 select SND_SOC_AC97_BUS
> =A0 =A0 =A0 =A0select SND_MPC52xx_DMA
> =A0 =A0 =A0 =A0select PPC_BESTCOMM_GEN_BD
> =A0 =A0 =A0 =A0help
>
>



--=20
Jon Smirl
jonsmirl@gmail.com

Re: [PATCH 1/2] alsa/soc: Fix typo in MPC5200 PSC AC97 driver Kconfig

[Mark Brown]

On Sun, Jun 28, 2009 at 01:41:52AM -0600, Grant Likely wrote:
> From: Grant Likely <grant.likely@secretlab.ca>
> 
> ALSA SoC drivers should be specify SND_SOC_AC97_BUS instead, not AC97_BUS.

Applied both.