Skip to contentSkip to conversation

pinctrl: Add OF dependency for PINCTRL_GENERIC_MUX

PATCH In review Frank Li 2 participants 2 messages Apr 8

Subsystems (3)
lore
Share & tools
lore

Frank Li

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 drivers/pinctrl/Kconfig   | 1 +
 drivers/pinctrl/pinconf.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/pinctrl/Kconfig +1 -0
index b6d4755e67510..a568f7664ea4d 100644
@@ -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
drivers/pinctrl/pinconf.h +1 -1
index 67044dff61e4c..83f2d00c732e1 100644
@@ -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;
 }
Signature · 1 line
2.43.0
maintainer
#1 lore raw

Hi Frank,

Quoted 9 lines · 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.

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