]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Feb 2015 15:42:12 +0000 (16:42 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 6 Mar 2015 19:50:25 +0000 (19:50 +0000)
The change to enable OMAP5 support on this platform was a little too
eager in adding a 'select' for a particular clock driver that might
not be enabled in all configurations, which in turn leads to a build
error:

warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects COMMON_CLK_PALMAS which has unmet direct dependencies (COMMON_CLK && MFD_PALMAS)
drivers/built-in.o: In function `palmas_clks_probe':
drivers/clk/clk-palmas.c:228: undefined reference to `palmas_ext_control_req_config'

I do not see a strong dependency here, so it's probably better to
drop this select and to avoid adding more complexity here.

Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/omap/Kconfig

index e7c78b0406b59c62fef534849571e49ed7b643d0..6768e4f7d7d0e264eb3ff37881155caf8c1d0229 100644 (file)
@@ -105,7 +105,7 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040
        select SND_OMAP_SOC_MCPDM
        select SND_SOC_TWL6040
        select SND_SOC_DMIC
-       select COMMON_CLK_PALMAS if SOC_OMAP5
+       select COMMON_CLK_PALMAS if MFD_PALMAS
        help
          Say Y if you want to add support for SoC audio on OMAP boards using
          ABE and twl6040 codec. This driver currently supports: