[PATCH 1/1] pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX
From: Frank Li
Date: Tue May 12 2026 - 10:57:14 EST
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@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202604072013.aI84l57L-lkp@xxxxxxxxx/
Signed-off-by: Frank Li <Frank.Li@xxxxxxx>
---
Linus Walleij:
I am sorry for missed a previous fixes patch
(https://lore.kernel.org/imx/20260408050702.2454661-1-Frank.Li@xxxxxxx/)
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