[PATCH] ARM: imx_*_defconfig: Fix i.MX pinctrl enablement

[PATCH] ARM: imx_*_defconfig: Fix i.MX pinctrl enablement

[Mark Brown]

When the i.MX pinctrl drivers were made user controllable by 17d210018914
("ARM: imx: Allow user to disable pinctrl") the select of pinctrl by the
arch code was removed. This change means that for the i.MX specific
defconfigs nothing enables the base PINCTRL Kconfig and things that depend
on it (eg, audio on the i.MX6 UDOO boards) stop working. Explicitly enable
PINCTRL in these configs to restore functionality with them.

Fixes: 17d210018914 ("ARM: imx: Allow user to disable pinctrl")
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 arch/arm/configs/imx_v4_v5_defconfig | 1 +
 arch/arm/configs/imx_v6_v7_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 875c8cdbada7d662994c9301c1caf5d30d7407e3..1af29d12129d01b0de0b9dde30eb9b43c5a83071 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -83,6 +83,7 @@ CONFIG_I2C_IMX=y
 CONFIG_SPI=y
 CONFIG_SPI_IMX=y
 CONFIG_SPI_SPIDEV=y
+CONFIG_PINCTRL=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MXC=y
 CONFIG_W1=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 0beecdde55f58330494b98ea0f1ecf9c04643e14..73f7aa7e75f71e304ac4c4c64277066d1c03a72a 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -204,6 +204,7 @@ CONFIG_SPI_FSL_QUADSPI=y
 CONFIG_SPI_GPIO=y
 CONFIG_SPI_IMX=y
 CONFIG_SPI_FSL_DSPI=y
+CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX8MM=y
 CONFIG_PINCTRL_IMX8MN=y
 CONFIG_PINCTRL_IMX8MP=y

---
base-commit: aaf20f870da056752f6386693cc0d8e25421ef35
change-id: 20241127-imx-pinctrl-enable-fc567a5b57b9

Best regards,
-- 
Mark Brown <broonie@kernel.org>

Re: [PATCH] ARM: imx_*_defconfig: Fix i.MX pinctrl enablement

[Fabio Estevam]

On Wed, Nov 27, 2024 at 4:25 PM Mark Brown <broonie@kernel.org> wrote:
>
> When the i.MX pinctrl drivers were made user controllable by 17d210018914
> ("ARM: imx: Allow user to disable pinctrl") the select of pinctrl by the
> arch code was removed. This change means that for the i.MX specific
> defconfigs nothing enables the base PINCTRL Kconfig and things that depend
> on it (eg, audio on the i.MX6 UDOO boards) stop working. Explicitly enable
> PINCTRL in these configs to restore functionality with them.
>
> Fixes: 17d210018914 ("ARM: imx: Allow user to disable pinctrl")
> Signed-off-by: Mark Brown <broonie@kernel.org>

I submitted the same fix:

https://lore.kernel.org/imx/d718ddd2-d473-4455-b21a-15024e46787c@roeck-us.net/T/#mc71dc21d99e0b013c5ce46c0d90940fd8806ae9a

but as Guenter pointed out, there are other defconfigs that select
ARCH_MXC, so this change is incomplete.

It will also cause regressions for people that have their own
defconfigs (where PINCTRL is not selected).

Then I came up with a v2 that simply re-select PINCTRL as a minimal
fix for the regressions:

https://lore.kernel.org/linux-arm-kernel/f65d65b3-b60c-4c5c-a002-81370821ee1f@app.fastmail.com/T/#u

Re: [PATCH] ARM: imx_*_defconfig: Fix i.MX pinctrl enablement

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

On Wed, Nov 27, 2024 at 04:36:12PM -0300, Fabio Estevam wrote:

> It will also cause regressions for people that have their own
> defconfigs (where PINCTRL is not selected).

AFACIT we generally just tolerate those.

> Then I came up with a v2 that simply re-select PINCTRL as a minimal
> fix for the regressions:

> https://lore.kernel.org/linux-arm-kernel/f65d65b3-b60c-4c5c-a002-81370821ee1f@app.fastmail.com/T/#u

That also works of course - whatever way we do this it'd be good to get
this fixed for -rc1.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]