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>

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 31d698fbaa01d5fd20b4ba7c352df7c5f8b3c686..f4ffe1f3b720f835fcfad7df5fd6bd49acca16cc 100644 (file)
--- 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 fa8fb0d290d1d97ba9e19d6a341a9b14c485e08e..9711d16c38b6239e40ced1c3853e15d6e504b2ba 100644 (file)
--- 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;
 }