[PATCH v3 3/7] pinctrl: pinctrl-generic: add __pinctrl_generic_pins_function_dt_node_to_map()

[Frank Li <Frank.Li@nxp.com>]

Introduce __pinctrl_generic_pins_function_dt_node_to_map() to allow
passing private data and skip_npins to pinmux_generic_add_function().

The 'skip_npins' to skip parse pins in dts because on boards MUX control
chip switch the whole group together, so needn't handle each pins.

Keep pinctrl_generic_pins_function_dt_node_to_map() as a wrapper
calling the new helper with a NULL argument to preserve backward
compatibility.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
changes in v3
- new patch
---
 drivers/pinctrl/pinconf.h         | 21 ++++++++++++++++----
 drivers/pinctrl/pinctrl-generic.c | 41 +++++++++++++++++++++++----------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index 2880adef476e68950ffdd540ea42cdee6a16ec27..d6d22c088a144de0180314826b8cb8c528290970 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -162,10 +162,23 @@ pinconf_generic_parse_dt_pinmux(struct device_node *np, struct device *dev,
 #endif
 
 #if defined(CONFIG_GENERIC_PINCTRL) && defined (CONFIG_OF)
-int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
-						 struct device_node *np,
-						 struct pinctrl_map **maps,
-						 unsigned int *num_maps);
+int __pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
+						   struct device_node *np,
+						   struct pinctrl_map **maps,
+						   unsigned int *num_maps,
+						   void *func_data,
+						   bool skip_npins);
+static inline int
+pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
+					     struct device_node *np,
+					     struct pinctrl_map **maps,
+					     unsigned int *num_maps)
+{
+	return __pinctrl_generic_pins_function_dt_node_to_map(pctldev, np, maps,
+							      num_maps, NULL,
+							      false);
+}
+
 #else
 static inline int
 pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index efb39c6a670331775855efdc8566102b5c6202ef..dc575fbcc7103bebded49d8268764531f349a8c9 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -24,21 +24,24 @@ static int pinctrl_generic_pins_function_dt_subnode_to_map(struct pinctrl_dev *p
 							   unsigned int *num_maps,
 							   unsigned int *num_reserved_maps,
 							   const char **group_names,
-							   unsigned int ngroups)
+							   unsigned int ngroups,
+							   bool skip_npins)
 {
 	struct device *dev = pctldev->dev;
 	const char **functions;
 	const char *group_name;
 	unsigned long *configs;
 	unsigned int num_configs, pin, *pins;
-	int npins, ret, reserve = 1;
+	int npins = 0, ret, reserve = 1;
 
-	npins = of_property_count_u32_elems(np, "pins");
+	if (!skip_npins) {
+		npins = of_property_count_u32_elems(np, "pins");
 
-	if (npins < 1) {
-		dev_err(dev, "invalid pinctrl group %pOFn.%pOFn %d\n",
-			parent, np, npins);
-		return npins;
+		if (npins < 1) {
+			dev_err(dev, "invalid pinctrl group %pOFn.%pOFn %d\n",
+				parent, np, npins);
+			return npins;
+		}
 	}
 
 	group_name = devm_kasprintf(dev, GFP_KERNEL, "%pOFn.%pOFn", parent, np);
@@ -110,10 +113,12 @@ static int pinctrl_generic_pins_function_dt_subnode_to_map(struct pinctrl_dev *p
  * and functions, create them in addition to parsing pinconf properties and
  * adding mappings.
  */
-int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
-						 struct device_node *np,
-						 struct pinctrl_map **maps,
-						 unsigned int *num_maps)
+int __pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
+						   struct device_node *np,
+						   struct pinctrl_map **maps,
+						   unsigned int *num_maps,
+						   void *func_data,
+						   bool skip_npins)
 {
 	struct device *dev = pctldev->dev;
 	struct device_node *child_np;
@@ -129,7 +134,7 @@ int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
 	 * Check if this is actually the pins node, or a parent containing
 	 * multiple pins nodes.
 	 */
-	if (!of_property_present(np, "pins"))
+	if (!of_property_present(np, "pins") && !skip_npins)
 		goto parent;
 
 	group_names = devm_kcalloc(dev, 1, sizeof(*group_names), GFP_KERNEL);
@@ -140,13 +145,14 @@ int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
 							      maps, num_maps,
 							      &num_reserved_maps,
 							      group_names,
-							      ngroups);
+							      ngroups,
+							      skip_npins);
 	if (ret) {
 		pinctrl_utils_free_map(pctldev, *maps, *num_maps);
 		return dev_err_probe(dev, ret, "error figuring out mappings for %s\n", np->name);
 	}
 
-	ret = pinmux_generic_add_function(pctldev, np->name, group_names, 1, NULL);
+	ret = pinmux_generic_add_function(pctldev, np->name, group_names, 1, func_data);
 	if (ret < 0) {
 		pinctrl_utils_free_map(pctldev, *maps, *num_maps);
 		return dev_err_probe(dev, ret, "error adding function %s\n", np->name);
@@ -168,7 +174,8 @@ int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
 								      maps, num_maps,
 								      &num_reserved_maps,
 								      group_names,
-								      ngroups);
+								      ngroups,
+								      skip_npins);
 		if (ret) {
 			pinctrl_utils_free_map(pctldev, *maps, *num_maps);
 			return dev_err_probe(dev, ret, "error figuring out mappings for %s\n",
@@ -178,7 +185,7 @@ int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
 		ngroups++;
 	}
 
-	ret = pinmux_generic_add_function(pctldev, np->name, group_names, ngroups, NULL);
+	ret = pinmux_generic_add_function(pctldev, np->name, group_names, ngroups, func_data);
 	if (ret < 0) {
 		pinctrl_utils_free_map(pctldev, *maps, *num_maps);
 		return dev_err_probe(dev, ret, "error adding function %s\n", np->name);
@@ -186,4 +193,4 @@ int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
 
 	return 0;
 }
-EXPORT_SYMBOL_GPL(pinctrl_generic_pins_function_dt_node_to_map);
+EXPORT_SYMBOL_GPL(__pinctrl_generic_pins_function_dt_node_to_map);

-- 
2.43.0