Skip to contentSkip to conversation

alsa/soc: Fix typo in MPC5200 PSC AC97 driver Kconfig

PATCH In review Grant Likely 3 participants 5 messages Jun 28, 2009 – Jun 29, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

From: Grant Likely <[email protected]>

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.

---

 sound/soc/fsl/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/fsl/Kconfig +1 -1
index 5dbebf8..5661876 100644
@@ -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
#1 lore raw

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

From: Grant Likely <[email protected]>

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.

---

 sound/soc/fsl/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/fsl/Kconfig +2 -2
index 5661876..8cb65cc 100644
@@ -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
Acked-by on v1 2/2
#2 lore raw

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

Quoted 10 lines · Grant Likely

From: Grant Likely <[email protected]>

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.

Quoted 30 lines

---

 sound/soc/fsl/Kconfig |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/fsl/Kconfig +0 -0
index 5661876..8cb65cc 100644
@@ -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

sound/soc/fsl/Kconfig +0 -0
@@ -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

Signature · 2 lines
Jon Smirl
[email protected]
Acked-by on v1 1/2
#3 lore raw
In reply to Grant Likely
Quoted 10 lines · Grant Likely

From: Grant Likely <[email protected]>

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.

Quoted 21 lines

---

 sound/soc/fsl/Kconfig |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/fsl/Kconfig +0 -0
index 5dbebf8..5661876 100644
@@ -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

Signature · 2 lines
Jon Smirl
[email protected]