| Message ID | 3413182.qcoNiOhonF@wuerfel (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0574eab363ace70ef275d4caad6eadc458d33728 |
| Headers | show |
On 05/19/2015 03:47 PM, Arnd Bergmann wrote: > I tried to fix this before and submitted a working patch, but after > some discussion we came up with what seemed to be a nicer solution, > resulting in commit 3d4cf65e2d ("ASoC: omap: fix up > SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency"). Unfortunately, that > version was incomplete, and we still get this build error: > > drivers/clk/clk-palmas.c:46:16: error: field 'hw' has incomplete type > drivers/clk/clk-palmas.c: In function 'to_palmas_clks_info': > drivers/clk/clk-palmas.c:54:74: warning: initialization from incompatible pointer type [-Winc > > This happens only in randconfig builds that turn on MFD_PALMAS > on a platform other than OMAP2+ when COMPILE_TEST is set > but COMMON_CLK is not. > > The new approach is only 'select COMMON_CLK_PALMAS' if we know > that we are on an OMAP5 platform and MFD_PALMAS is already set. > This patch has survived thousands of randconfig builds and I > don't see a remaining hole in the logic. Yeah, debugging Kconfig is not for the faint-hearted ;) Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: 3d4cf65e2d ("ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency") > > diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig > index 6768e4f7d7d0..30d0109703a9 100644 > --- a/sound/soc/omap/Kconfig > +++ b/sound/soc/omap/Kconfig > @@ -100,12 +100,13 @@ config SND_OMAP_SOC_OMAP_TWL4030 > > config SND_OMAP_SOC_OMAP_ABE_TWL6040 > tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" > - depends on TWL6040_CORE && SND_OMAP_SOC && (ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST) > + depends on TWL6040_CORE && SND_OMAP_SOC > + depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST > select SND_OMAP_SOC_DMIC > select SND_OMAP_SOC_MCPDM > select SND_SOC_TWL6040 > select SND_SOC_DMIC > - select COMMON_CLK_PALMAS if MFD_PALMAS > + select COMMON_CLK_PALMAS if (SOC_OMAP5 && 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 Tue, May 19, 2015 at 02:47:32PM +0200, Arnd Bergmann wrote: > I tried to fix this before and submitted a working patch, but after > some discussion we came up with what seemed to be a nicer solution, > resulting in commit 3d4cf65e2d ("ASoC: omap: fix up > SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency"). Unfortunately, that > version was incomplete, and we still get this build error: Applied, thanks.
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 6768e4f7d7d0..30d0109703a9 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -100,12 +100,13 @@ config SND_OMAP_SOC_OMAP_TWL4030 config SND_OMAP_SOC_OMAP_ABE_TWL6040 tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" - depends on TWL6040_CORE && SND_OMAP_SOC && (ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST) + depends on TWL6040_CORE && SND_OMAP_SOC + depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST select SND_OMAP_SOC_DMIC select SND_OMAP_SOC_MCPDM select SND_SOC_TWL6040 select SND_SOC_DMIC - select COMMON_CLK_PALMAS if MFD_PALMAS + select COMMON_CLK_PALMAS if (SOC_OMAP5 && 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:
I tried to fix this before and submitted a working patch, but after some discussion we came up with what seemed to be a nicer solution, resulting in commit 3d4cf65e2d ("ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency"). Unfortunately, that version was incomplete, and we still get this build error: drivers/clk/clk-palmas.c:46:16: error: field 'hw' has incomplete type drivers/clk/clk-palmas.c: In function 'to_palmas_clks_info': drivers/clk/clk-palmas.c:54:74: warning: initialization from incompatible pointer type [-Winc This happens only in randconfig builds that turn on MFD_PALMAS on a platform other than OMAP2+ when COMPILE_TEST is set but COMMON_CLK is not. The new approach is only 'select COMMON_CLK_PALMAS' if we know that we are on an OMAP5 platform and MFD_PALMAS is already set. This patch has survived thousands of randconfig builds and I don't see a remaining hole in the logic. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 3d4cf65e2d ("ASoC: omap: fix up SND_OMAP_SOC_OMAP_ABE_TWL6040 dependency")