[alsa-devel] [PATCH] 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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com ---
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index e720d5e..bee3c94 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -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
On Thu, 2010-11-11 at 09:02 +1300, Ryan Mallon wrote:
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
On 11/11/2010 10:04 AM, Liam Girdwood wrote:
On Thu, 2010-11-11 at 09:02 +1300, Ryan Mallon wrote:
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com ---
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index e720d5e..a614181 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -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
On Wednesday 10 November 2010 3:54:08 pm Ryan Mallon wrote:
On 11/11/2010 10:04 AM, Liam Girdwood wrote:
On Thu, 2010-11-11 at 09:02 +1300, Ryan Mallon wrote:
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
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.
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com
Acked-by: Geoffrey Wossum gwossum@acm.org
On Wed, 2010-11-10 at 17:09 -0600, Geoffrey Wossum wrote:
On Wednesday 10 November 2010 3:54:08 pm Ryan Mallon wrote:
On 11/11/2010 10:04 AM, Liam Girdwood wrote:
On Thu, 2010-11-11 at 09:02 +1300, Ryan Mallon wrote:
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
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.
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com
Acked-by: Geoffrey Wossum gwossum@acm.org
Acked-by: Liam Girdwood lrg@slimlogic.co.uk
On Thu, Nov 11, 2010 at 09:02:30AM +1300, Ryan Mallon wrote:
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.
Signed-off-by: Ryan Mallon ryan@bluewatersys.com
Applied, thanks.
participants (4)
-
Geoffrey Wossum -
Liam Girdwood -
Mark Brown -
Ryan Mallon