[PATCH 1/1] pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX

[PATCH 1/1] pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX

[Frank Li]

Add an explicit OF dependency for PINCTRL_GENERIC_MUX to ensure the
generic mux support is only enabled when device tree is available.

Also fix the stub implementation of pinctrl_generic_to_map() by correcting
its last argument to match the non-stub prototype.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202604072013.aI84l57L-lkp@intel.com/
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/pinctrl/Kconfig   | 1 +
 drivers/pinctrl/pinconf.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index b6d4755e67510..a568f7664ea4d 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -277,6 +277,7 @@ config PINCTRL_GEMINI
 config PINCTRL_GENERIC_MUX
 	tristate "Generic Pinctrl driver by using multiplexer"
 	depends on MULTIPLEXER
+	depends on OF
 	select PINMUX
 	select GENERIC_PINCTRL
 	help
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index 67044dff61e4c..83f2d00c732e1 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -189,7 +189,7 @@ pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
 		       unsigned int *num_maps, unsigned int *num_reserved_maps,
 		       const char **group_name, unsigned int ngroups,
 		       const char **functions, unsigned int *pins,
-		       void *function_data)
+		       unsigned int npins)
 {
 	return -ENOTSUPP;
 }
-- 
2.43.0

Re: [PATCH 1/1] pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX

[Linus Walleij]

Hi Frank,

On Wed, Apr 8, 2026 at 7:07 AM Frank Li <Frank.Li@nxp.com> wrote:

> Add an explicit OF dependency for PINCTRL_GENERIC_MUX to ensure the
> generic mux support is only enabled when device tree is available.
>
> Also fix the stub implementation of pinctrl_generic_to_map() by correcting
> its last argument to match the non-stub prototype.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202604072013.aI84l57L-lkp@intel.com/
> Signed-off-by: Frank Li <Frank.Li@nxp.com>

I just squashed the fixes into respective offending committ, then
re-pushed my immutable branch.

Let's see if this compiles fine, if so I can merge it into devel
for v7.1.

Yours,
Linus Walleij

[PATCH 1/1] pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX

[Frank Li]

Add an explicit OF dependency for PINCTRL_GENERIC_MUX to ensure the
generic mux support is only enabled when device tree is available.

Also fix the stub implementation of pinctrl_generic_to_map() by correcting
its last argument to match the non-stub prototype.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202604072013.aI84l57L-lkp@intel.com/
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Linus Walleij:
	I am sorry for missed a previous fixes patch
(https://lore.kernel.org/imx/20260408050702.2454661-1-Frank.Li@nxp.com/)
when rebase since it is located another fixes tree.

Frank
---
 drivers/pinctrl/Kconfig   | 1 +
 drivers/pinctrl/pinconf.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 31d698fbaa01d..f4ffe1f3b720f 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -275,6 +275,7 @@ config PINCTRL_GEMINI
 config PINCTRL_GENERIC_MUX
 	tristate "Generic Pinctrl driver by using multiplexer"
 	depends on MULTIPLEXER
+	depends on OF
 	select PINMUX
 	select GENERIC_PINCTRL
 	help
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index fa8fb0d290d1d..9711d16c38b62 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -195,7 +195,7 @@ pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
 		       unsigned int *num_maps, unsigned int *num_reserved_maps,
 		       const char **group_name, unsigned int ngroups,
 		       const char **functions, unsigned int *pins,
-		       void *function_data)
+		       unsigned int npins)
 {
 	return -ENOTSUPP;
 }
-- 
2.43.0