Message ID | 7519324a34015e1c046227269409fef688889f4f.1688643442.git.geert@linux-m68k.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | regmap: Fix REGMAP selections | expand |
On Thu, Jul 06, 2023 at 01:42:03PM +0200, Geert Uytterhoeven wrote: > Fix this by making REGMAP_SLIMBUS select REGMAP. Why is this being done as a separate patch? > Drop the selection of REGMAP by MFD_WCD934X, as this is not needed > (now both REGMAP_SLIMBUS and REGMAP_IRQ select REGMAP). This has always been redudnant, why is it mixed into this patch?
Hi Mark, On Thu, Jul 6, 2023 at 2:18 PM Mark Brown <broonie@kernel.org> wrote: > On Thu, Jul 06, 2023 at 01:42:03PM +0200, Geert Uytterhoeven wrote: > > > Fix this by making REGMAP_SLIMBUS select REGMAP. > > Why is this being done as a separate patch? Because this is a new select, which was not handled through the "default y" before. [PATCH 1/3] converted only the existing ones. > > Drop the selection of REGMAP by MFD_WCD934X, as this is not needed > > (now both REGMAP_SLIMBUS and REGMAP_IRQ select REGMAP). > > This has always been redudnant, why is it mixed into this patch? Because it is related to REGMAP_SLIMBUS selecting REGMAP. I agree it was redundant before, as REGMAP_IRQ already selected REGMAP. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Thu, 06 Jul 2023, Geert Uytterhoeven wrote: > If CONFIG_SND_SOC_WCD934X=y, CONFIG_COMPILE_TEST=y, > CONFIG_MFD_WCD934X=n, CONFIG_REGMAP=n: > > sound/soc/codecs/wcd934x.c:518:38: error: array type has incomplete element type ‘struct regmap_range_cfg’ > 518 | static const struct regmap_range_cfg wcd934x_ifc_ranges[] = { > | ^~~~~~~~~~~~~~~~~~ > > Fix this by making REGMAP_SLIMBUS select REGMAP. > > Drop the selection of REGMAP by MFD_WCD934X, as this is not needed > (now both REGMAP_SLIMBUS and REGMAP_IRQ select REGMAP). > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > --- > drivers/base/regmap/Kconfig | 1 + > drivers/mfd/Kconfig | 1 - Acked-by: Lee Jones <lee@kernel.org> > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig > index e25cc619c75de3d9..c3a260ed4e864959 100644 > --- a/drivers/base/regmap/Kconfig > +++ b/drivers/base/regmap/Kconfig > @@ -34,6 +34,7 @@ config REGMAP_I2C > config REGMAP_SLIMBUS > tristate > depends on SLIMBUS > + select REGMAP > > config REGMAP_SPI > tristate > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 0b6af476f554a191..5857dad2c64828fa 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -2121,7 +2121,6 @@ config MFD_STMFX > config MFD_WCD934X > tristate "Support for WCD9340/WCD9341 Codec" > depends on SLIMBUS > - select REGMAP > select REGMAP_SLIMBUS > select REGMAP_IRQ > select MFD_CORE > -- > 2.34.1 >
diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig index e25cc619c75de3d9..c3a260ed4e864959 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -34,6 +34,7 @@ config REGMAP_I2C config REGMAP_SLIMBUS tristate depends on SLIMBUS + select REGMAP config REGMAP_SPI tristate diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 0b6af476f554a191..5857dad2c64828fa 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -2121,7 +2121,6 @@ config MFD_STMFX config MFD_WCD934X tristate "Support for WCD9340/WCD9341 Codec" depends on SLIMBUS - select REGMAP select REGMAP_SLIMBUS select REGMAP_IRQ select MFD_CORE
If CONFIG_SND_SOC_WCD934X=y, CONFIG_COMPILE_TEST=y, CONFIG_MFD_WCD934X=n, CONFIG_REGMAP=n: sound/soc/codecs/wcd934x.c:518:38: error: array type has incomplete element type ‘struct regmap_range_cfg’ 518 | static const struct regmap_range_cfg wcd934x_ifc_ranges[] = { | ^~~~~~~~~~~~~~~~~~ Fix this by making REGMAP_SLIMBUS select REGMAP. Drop the selection of REGMAP by MFD_WCD934X, as this is not needed (now both REGMAP_SLIMBUS and REGMAP_IRQ select REGMAP). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/base/regmap/Kconfig | 1 + drivers/mfd/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)