From: Frank Li Date: Wed, 8 Apr 2026 05:07:01 +0000 (-0400) Subject: pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea024873fe4316e4dc1d18657b8059b73f72b5d0;p=thirdparty%2Fkernel%2Flinux.git pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX 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 Closes: https://lore.kernel.org/oe-kbuild-all/202604072013.aI84l57L-lkp@intel.com/ Signed-off-by: Frank Li Signed-off-by: Linus Walleij --- 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; }