pinctrl: pinconf-generic: Infer map type from DT property

With the new 'groups' property, the DT parser can infer the map type
from the fact whether 'pins' or 'groups' is used to specify the pin
group to work on.

To maintain backwards compatibitliy with current usage of the DT
binding, this is only done when PIN_MAP_TYPE_INVALID is passed to the
parsing function as type.

Also, a new helper 'pinconf_generic_dt_node_to_map_all()' is introduced,
which can be used by drivers as generic callback for dt_node_to_map() to
leverage the new feature.

Changes since v2:
 - rename dt_pin_specifier to subnode_target_type
 - add additional comment in header file explaining passing an invalid
   map type
 - mention map_all() helper in commit message
Changes since RFC v2:
 - none

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Tested-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index f78b416d7984..21b3d90ebb2d 100644
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -264,6 +264,7 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
         unsigned reserve;
         struct property *prop;
         const char *group;
+        const char *subnode_target_type = "pins";
 
         ret = of_property_read_string(np, "function", &function);
         if (ret < 0) {
@@ -284,10 +285,20 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
                 reserve++;
         if (num_configs)
                 reserve++;
+
         ret = of_property_count_strings(np, "pins");
         if (ret < 0) {
-                dev_err(dev, "could not parse property pins\n");
-                goto exit;
+                ret = of_property_count_strings(np, "groups");
+                if (ret < 0) {
+                        dev_err(dev, "could not parse property pins/groups\n");
+                        goto exit;
+                }
+                if (type == PIN_MAP_TYPE_INVALID)
+                        type = PIN_MAP_TYPE_CONFIGS_GROUP;
+                subnode_target_type = "groups";
+        } else {
+                if (type == PIN_MAP_TYPE_INVALID)
+                        type = PIN_MAP_TYPE_CONFIGS_PIN;
         }
         reserve *= ret;
 
@@ -296,7 +307,7 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
         if (ret < 0)
                 goto exit;
 
-        of_property_for_each_string(np, "pins", prop, group) {
+        of_property_for_each_string(np, subnode_target_type, prop, group) {
                 if (function) {
                         ret = pinctrl_utils_add_map_mux(pctldev, map,
                                         reserved_maps, num_maps, group,