diff options
| author | Frank Li <Frank.Li@nxp.com> | 2026-04-08 01:07:01 -0400 |
|---|---|---|
| committer | Linus Walleij <linusw@kernel.org> | 2026-05-23 11:02:28 +0200 |
| commit | ea024873fe4316e4dc1d18657b8059b73f72b5d0 (patch) | |
| tree | 03d5e21d4299b9ebec4df4aa5d5e685da7cb9724 /drivers | |
| parent | bdb939247b269f2018412e9089d6aed3c7997d4f (diff) | |
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 <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>
Signed-off-by: Linus Walleij <linusw@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pinctrl/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pinctrl/pinconf.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 31d698fbaa01..f4ffe1f3b720 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 fa8fb0d290d1..9711d16c38b6 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; } |
