pinctrl: add new generic groups/function creation function for pinmux

Akin to my recently added pinctrl_generic_pins_functions_dt_node_to_map(),
create an analogue that performs the same role of dynamically creating
groups at runtime for controllers using the pinmux property.
The pinmux property is freeform, so this function mandates that the
upper 16 bits contain the pin and the lower 16 bits contains the mux
setting. The group's data pointer is populated with an array of the mux
settings for each pin it contains.

Since the node parsing and subsequent pinctrl core function calls are
practically identical to the pins + functions case, other than which
properties are examined, it makes sense to extract the common code from
pinctrl_generic_pins_function_dt_node_to_map() into a generic function
that takes the case-specific devicetree parsing function as an argument.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Linus Walleij <linusw@kernel.org>

diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index 396f65ffe7a650e412d21e0627804cc7c03c0c2d..fc2d6cce9afb627a7034720dca0be074c72784a4 100644 (file)
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -173,6 +173,11 @@ int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
                                                 struct pinctrl_map **maps,
                                                 unsigned int *num_maps);
 
+int pinctrl_generic_pinmux_dt_node_to_map(struct pinctrl_dev *pctldev,
+                                         struct device_node *np,
+                                         struct pinctrl_map **maps,
+                                         unsigned int *num_maps);
+
 int pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
                           struct device_node *np, struct pinctrl_map **maps,
                           unsigned int *num_maps, unsigned int *num_reserved_maps,
@@ -188,6 +193,15 @@ pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
        return -ENOTSUPP;
 }
 
+static inline int
+pinctrl_generic_pinmux_dt_node_to_map(struct pinctrl_dev *pctldev,
+                                     struct device_node *np,
+                                     struct pinctrl_map **maps,
+                                     unsigned int *num_maps)
+{
+       return -ENOTSUPP;
+}
+
 static inline int
 pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
                       struct device_node *np, struct pinctrl_map **maps,

diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index a3faad7911cbfff9654b94a0d4b17d9a73147401..9759b0186bcc23e760e03f88138cbe6a9422aef4 100644 (file)
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -119,17 +119,64 @@ static int pinctrl_generic_pins_function_dt_subnode_to_map(struct pinctrl_dev *p
                                      functions, pins, npins);
 }
 
-/*
- * For platforms that do not define groups or functions in the driver, but
- * instead use the devicetree to describe them. This function will, unlike
- * pinconf_generic_dt_node_to_map() etc which rely on driver defined groups
- * 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)
+static int pinctrl_generic_pinmux_dt_subnode_to_map(struct pinctrl_dev *pctldev,
+                                                   struct device_node *parent,
+                                                   struct device_node *np,
+                                                   struct pinctrl_map **maps,
+                                                   unsigned int *num_maps,
+                                                   unsigned int *num_reserved_maps,
+                                                   const char **group_names,
+                                                   unsigned int ngroups)
+{
+       struct device *dev = pctldev->dev;
+       unsigned int *pins, *muxes;
+       int npins, ret;
+
+       npins = of_property_count_u32_elems(np, "pinmux");
+
+       if (npins < 1) {
+               dev_err(dev, "invalid pinctrl group %pOFn.%pOFn %d\n",
+                       parent, np, npins);
+               return npins;
+       }
+
+       pins = devm_kcalloc(dev, npins, sizeof(*pins), GFP_KERNEL);
+       if (!pins)
+               return -ENOMEM;
+
+       muxes = devm_kcalloc(dev, npins, sizeof(*muxes), GFP_KERNEL);
+       if (!muxes)
+               return -ENOMEM;
+
+       for (int i = 0; i < npins; i++) {
+               unsigned int pinmux;
+
+               ret = of_property_read_u32_index(np, "pinmux", i, &pinmux);
+               if (ret)
+                       return ret;
+
+               pins[i] = pinmux >> 16;
+               muxes[i] = pinmux & GENMASK(15, 0);
+       }
+
+       return pinctrl_generic_to_map(pctldev, parent, np, maps, num_maps,
+                                     num_reserved_maps, group_names, ngroups,
+                                     muxes, pins, npins);
+}
+
+static int pinctrl_generic_dt_node_to_map(struct pinctrl_dev *pctldev,
+                                         struct device_node *np,
+                                         struct pinctrl_map **maps,
+                                         unsigned int *num_maps,
+                                         int (dt_subnode_to_map)(
+                                                 struct pinctrl_dev *,
+                                                 struct device_node *,
+                                                 struct device_node *,
+                                                 struct pinctrl_map **,
+                                                 unsigned int *,
+                                                 unsigned int *,
+                                                 const char **,
+                                                 unsigned int))
 {
        struct device *dev = pctldev->dev;
        struct device_node *child_np;
@@ -152,11 +199,8 @@ int pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
        if (!group_names)
                return -ENOMEM;
 
-       ret = pinctrl_generic_pins_function_dt_subnode_to_map(pctldev, np, np,
-                                                             maps, num_maps,
-                                                             &num_reserved_maps,
-                                                             group_names,
-                                                             ngroups);
+       ret = dt_subnode_to_map(pctldev, np, np, maps, num_maps,
+                               &num_reserved_maps, group_names, ngroups);
        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);
@@ -180,11 +224,8 @@ parent:
 
        ngroups = 0;
        for_each_available_child_of_node_scoped(np, child_np) {
-               ret = pinctrl_generic_pins_function_dt_subnode_to_map(pctldev, np, child_np,
-                                                                     maps, num_maps,
-                                                                     &num_reserved_maps,
-                                                                     group_names,
-                                                                     ngroups);
+               ret = dt_subnode_to_map(pctldev, np, child_np, maps, num_maps,
+                                       &num_reserved_maps, group_names, ngroups);
                if (ret) {
                        pinctrl_utils_free_map(pctldev, *maps, *num_maps);
                        return dev_err_probe(dev, ret, "error figuring out mappings for %s\n",
@@ -202,4 +243,40 @@ parent:
 
        return 0;
 }
+
+/*
+ * For platforms that do not define groups or functions in the driver, but
+ * instead use the devicetree to describe them. This function will, unlike
+ * pinconf_generic_dt_node_to_map() etc which rely on driver defined groups
+ * 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)
+{
+       return pinctrl_generic_dt_node_to_map(pctldev, np, maps, num_maps,
+                                             &pinctrl_generic_pins_function_dt_subnode_to_map);
+}
 EXPORT_SYMBOL_GPL(pinctrl_generic_pins_function_dt_node_to_map);
+
+/*
+ * For platforms that do not define groups or functions in the driver, but
+ * instead use the devicetree to describe them. This function will, unlike
+ * pinconf_generic_dt_node_to_map() etc which rely on driver defined groups
+ * and functions, create them in addition to parsing pinconf properties and
+ * adding mappings.
+ *
+ * It assumes that the upper 16 bits of the pinmux items contain the pin
+ * and the lower 16 the mux setting.
+ */
+int pinctrl_generic_pinmux_dt_node_to_map(struct pinctrl_dev *pctldev,
+                                         struct device_node *np,
+                                         struct pinctrl_map **maps,
+                                         unsigned int *num_maps)
+{
+       return pinctrl_generic_dt_node_to_map(pctldev, np, maps, num_maps,
+                                             &pinctrl_generic_pinmux_dt_subnode_to_map);
+};
+EXPORT_SYMBOL_GPL(pinctrl_generic_pinmux_dt_node_to_map);