[PATCH 1/2] pinctrl: stmfx: fix mfd dependency

[PATCH 1/2] pinctrl: stmfx: fix mfd dependency

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The PINCTRL_STMFX driver attempts to force-enable its MFD parent
driver, which is really the wrong way around compared to general
conventions. After the OF_GPIO dependency got dropped, this leads
to a harmless but annoying build warning:

WARNING: unmet direct dependencies detected for MFD_STMFX
  Depends on [n]: HAS_IOMEM [=y] && I2C [=y] && OF [=n]
  Selected by [m]:
  - PINCTRL_STMFX [=m] && PINCTRL [=y] && I2C [=y] && HAS_IOMEM [=y]

Change the 'select' into a dependency instead. As this changes the
defconfig behavior, also change the generic arm defconfig file to enable
the other symbol instead.

Fixes: e785c990adcc ("pinctrl: Kconfig: drop unneeded dependencies on OF_GPIO")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/pinctrl/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 03f2e3ee065f..51a2ddad2a48 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -550,9 +550,10 @@ config PINCTRL_STMFX
 	tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
 	depends on I2C
 	depends on HAS_IOMEM
+	depends on MFD_STMFX
+	default MFD_STMFX
 	select GENERIC_PINCONF
 	select GPIOLIB_IRQCHIP
-	select MFD_STMFX
 	help
 	  Driver for STMicroelectronics Multi-Function eXpander (STMFX)
 	  GPIO expander.
-- 
2.39.5

[PATCH 2/2] ARM: defconfig: enable CONFIG_MFD_STMFX instead of PINCTRL_STMFX

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

PINCTRL_STMFX now depends on MFD_STMFX instead of selecting it, so
adapt the defconfig to pick the right one again.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/configs/multi_v7_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index c102c4acdd8f..728b36ad3a08 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -481,7 +481,6 @@ CONFIG_PINCTRL_MCP23S08=m
 CONFIG_PINCTRL_MICROCHIP_SGPIO=y
 CONFIG_PINCTRL_OCELOT=y
 CONFIG_PINCTRL_PALMAS=y
-CONFIG_PINCTRL_STMFX=y
 CONFIG_PINCTRL_OWL=y
 CONFIG_PINCTRL_S500=y
 CONFIG_PINCTRL_MSM=y
@@ -627,6 +626,7 @@ CONFIG_MFD_SPMI_PMIC=y
 CONFIG_MFD_RK8XX_I2C=y
 CONFIG_MFD_RN5T618=y
 CONFIG_MFD_SEC_I2C=y
+CONFIG_MFD_STMFX=y
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_PALMAS=y
 CONFIG_MFD_TPS65090=y
-- 
2.39.5

Re: [PATCH 2/2] ARM: defconfig: enable CONFIG_MFD_STMFX instead of PINCTRL_STMFX

[Linus Walleij]

On Thu, Mar 12, 2026 at 9:18 AM Arnd Bergmann <arnd@kernel.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
>
> PINCTRL_STMFX now depends on MFD_STMFX instead of selecting it, so
> adapt the defconfig to pick the right one again.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Linus Walleij <linusw@kernel.org>

Yours,
Linus Walleij

Re: [PATCH 1/2] pinctrl: stmfx: fix mfd dependency

[Linus Walleij]

On Thu, Mar 12, 2026 at 9:18 AM Arnd Bergmann <arnd@kernel.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
>
> The PINCTRL_STMFX driver attempts to force-enable its MFD parent
> driver, which is really the wrong way around compared to general
> conventions. After the OF_GPIO dependency got dropped, this leads
> to a harmless but annoying build warning:
>
> WARNING: unmet direct dependencies detected for MFD_STMFX
>   Depends on [n]: HAS_IOMEM [=y] && I2C [=y] && OF [=n]
>   Selected by [m]:
>   - PINCTRL_STMFX [=m] && PINCTRL [=y] && I2C [=y] && HAS_IOMEM [=y]
>
> Change the 'select' into a dependency instead. As this changes the
> defconfig behavior, also change the generic arm defconfig file to enable
> the other symbol instead.
>
> Fixes: e785c990adcc ("pinctrl: Kconfig: drop unneeded dependencies on OF_GPIO")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Linus Walleij <linusw@kernel.org>

Yours,
Linus Walleij