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

[Arnd Bergmann]

From: Arnd Bergmann <arnd@xxxxxxxx>

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@xxxxxxxx>
---
 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