| Message ID | 20200204131857.7634-1-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 13426feaf46c48fcddb591e89d35120fcc90527f |
| Headers | show |
| Series | ASoC: wcd934x: Add missing COMMON_CLK dependency to SND_SOC_ALL_CODECS | expand |
Hi Geert, On Tue, 4 Feb 2020 14:18:57 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > Just adding a dependency on COMMON_CLK to SND_SOC_WCD934X is not > sufficient, as enabling SND_SOC_ALL_CODECS will still select it, > breaking the build later: > > WARNING: unmet direct dependencies detected for SND_SOC_WCD934X > Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMMON_CLK [=n] && MFD_WCD934X [=m] > Selected by [m]: > - SND_SOC_ALL_CODECS [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMPILE_TEST [=y] && MFD_WCD934X [=m] > ... > ERROR: "of_clk_add_provider" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! > ERROR: "of_clk_src_simple_get" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! > ERROR: "clk_hw_register" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! > ERROR: "__clk_get_name" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! > > Fix this by adding the missing dependency to SND_SOC_ALL_CODECS > > Fixes: 42b716359beca106 ("ASoC: wcd934x: Add missing COMMON_CLK dependency") > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > --- > Seen with e.g. m68k/allmodconfig. Also seen with powerpc/allyesconfig Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
On Tue, Feb 04, 2020 at 02:18:57PM +0100, Geert Uytterhoeven wrote: > Just adding a dependency on COMMON_CLK to SND_SOC_WCD934X is not > sufficient, as enabling SND_SOC_ALL_CODECS will still select it, > breaking the build later: Srini already fixed this.
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2865148659600346..7e90f5d830971309 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -214,7 +214,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_UDA134X select SND_SOC_UDA1380 if I2C select SND_SOC_WCD9335 if SLIMBUS - select SND_SOC_WCD934X if MFD_WCD934X + select SND_SOC_WCD934X if MFD_WCD934X && COMMON_CLK select SND_SOC_WL1273 if MFD_WL1273_CORE select SND_SOC_WM0010 if SPI_MASTER select SND_SOC_WM1250_EV1 if I2C
Just adding a dependency on COMMON_CLK to SND_SOC_WCD934X is not sufficient, as enabling SND_SOC_ALL_CODECS will still select it, breaking the build later: WARNING: unmet direct dependencies detected for SND_SOC_WCD934X Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMMON_CLK [=n] && MFD_WCD934X [=m] Selected by [m]: - SND_SOC_ALL_CODECS [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMPILE_TEST [=y] && MFD_WCD934X [=m] ... ERROR: "of_clk_add_provider" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! ERROR: "of_clk_src_simple_get" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! ERROR: "clk_hw_register" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! ERROR: "__clk_get_name" [sound/soc/codecs/snd-soc-wcd934x.ko] undefined! Fix this by adding the missing dependency to SND_SOC_ALL_CODECS Fixes: 42b716359beca106 ("ASoC: wcd934x: Add missing COMMON_CLK dependency") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- Seen with e.g. m68k/allmodconfig. --- sound/soc/codecs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)