Skip to contentSkip to conversation

Fix Atmel soc audio boards Kconfig dependency

PATCH Applied Ryan Mallon 4 participants 6 messages Nov 10, 2010 – Nov 11, 2010

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

PATCH 1/1 Fix Atmel soc audio boards Kconfig dependency

Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

---

sound/soc/atmel/Kconfig +3 -2
index e720d5e..bee3c94 100644
@@ -16,7 +16,8 @@ config SND_ATMEL_SOC_SSC
 
 config SND_AT91_SOC_SAM9G20_WM8731
 	tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
-	depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC
+	depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \
+                   AT91_PROGRAMMABLE_CLOCKS
 	select SND_ATMEL_SOC_SSC
 	select SND_SOC_WM8731
 	help
@@ -25,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731
 
 config SND_AT32_SOC_PLAYPAQ
         tristate "SoC Audio support for PlayPaq with WM8510"
-        depends on SND_ATMEL_SOC && BOARD_PLAYPAQ
+        depends on SND_ATMEL_SOC && BOARD_PLAYPAQ && AT91_PROGRAMMABLE_CLOCKS
         select SND_ATMEL_SOC_SSC
         select SND_SOC_WM8510
         help
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Ryan Mallon

Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
#2 lore raw
Quoted 11 lines · Liam Girdwood
Quoted 7 lines · Ryan Mallon

Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

Just realised that the PlayPaq board only appears in the sound/soc/atmel directory. I cannot find a board file for it under either arch/arm/mach-at91 or arch/avr32/. The updated patch below only changes the dependency for the SAM9G20-EK board since I think the PlayPaq is actually AVR32, and therefore should not depend on AT91_PROGRAMMABLE_CLOCKS. This patch replaces my previous one.

---
Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK board. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

---

sound/soc/atmel/Kconfig +2 -1
index e720d5e..a614181 100644
@@ -16,7 +16,8 @@ config SND_ATMEL_SOC_SSC
 
 config SND_AT91_SOC_SAM9G20_WM8731
 	tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
-	depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC
+	depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \
+                   AT91_PROGRAMMABLE_CLOCKS
 	select SND_ATMEL_SOC_SSC
 	select SND_SOC_WM8731
 	help
#3 lore raw
Quoted 9 lines · Ryan Mallon
Quoted 8 lines · Liam Girdwood
Quoted 6 lines · Ryan Mallon

Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

Quoted 8 lines
Quoted 1 line

Just realised that the PlayPaq board only appears in the sound/soc/atmel directory. I cannot find a board file for it under either arch/arm/mach-at91 or arch/avr32/. The updated patch below only changes the dependency for the SAM9G20-EK board since I think the PlayPaq is actually AVR32, and therefore should not depend on AT91_PROGRAMMABLE_CLOCKS. This patch replaces my previous one.

PlayPaq is an AT32AP7000 board, so the new patch is correct.

Quoted 6 lines

---
Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK board. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

Acked-by
#4 lore raw
Quoted 21 lines · Geoffrey Wossum
Quoted 9 lines · Ryan Mallon
Quoted 8 lines · Liam Girdwood
Quoted 6 lines · Ryan Mallon

Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

Quoted 8 lines
Quoted 1 line

Just realised that the PlayPaq board only appears in the sound/soc/atmel directory. I cannot find a board file for it under either arch/arm/mach-at91 or arch/avr32/. The updated patch below only changes the dependency for the SAM9G20-EK board since I think the PlayPaq is actually AVR32, and therefore should not depend on AT91_PROGRAMMABLE_CLOCKS. This patch replaces my previous one.

PlayPaq is an AT32AP7000 board, so the new patch is correct.

Quoted 8 lines
Quoted 6 lines

---
Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK board. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
Applied
#5 lore raw
In reply to Ryan Mallon
Quoted 6 lines · Ryan Mallon

Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS.

Applied, thanks.