| Message ID | 2707228.SKhEXovzW4@wuerfel (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3d4cf65e2db58f927ca3cd13b0074b8fe5124659 |
| Headers | show |
On 02/25/2015 05:42 PM, Arnd Bergmann wrote: > 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. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio") Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > v2: change the dependency as suggested by Peter > > diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig > index e7c78b0406b5..6768e4f7d7d0 100644 > --- a/sound/soc/omap/Kconfig > +++ b/sound/soc/omap/Kconfig > @@ -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: > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
On Wed, Feb 25, 2015 at 04:42:12PM +0100, Arnd Bergmann wrote: > 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: Applied, thanks.
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index e7c78b0406b5..6768e4f7d7d0 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -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:
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. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 5163c1eede8e9 ("ASoC: omap: Kconfig: Support for omap5-uevm analog audio") --- v2: change the dependency as suggested by Peter