Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinconf-generic.c

diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c
index 4db92f64b4de77ef1038ad8e39695cff22c696e8..e63ad9fbd388a79c1afe0f1b4a2ff99e19a11574 100644 (file)
--- a/drivers/pinctrl/pinconf-generic.c
+++ b/drivers/pinctrl/pinconf-generic.c
@@ -283,23 +283,40 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
        struct device *dev = pctldev->dev;
        unsigned long *configs = NULL;
        unsigned num_configs = 0;
-       unsigned reserve;
+       unsigned reserve, strings_count;
        struct property *prop;
        const char *group;
        const char *subnode_target_type = "pins";
 
+       ret = of_property_count_strings(np, "pins");
+       if (ret < 0) {
+               ret = of_property_count_strings(np, "groups");
+               if (ret < 0)
+                       /* skip this node; may contain config child nodes */
+                       return 0;
+               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;
+       }
+       strings_count = ret;
+
        ret = of_property_read_string(np, "function", &function);
        if (ret < 0) {
                /* EINVAL=missing, which is fine since it's optional */
                if (ret != -EINVAL)
-                       dev_err(dev, "could not parse property function\n");
+                       dev_err(dev, "%s: could not parse property function\n",
+                               of_node_full_name(np));
                function = NULL;
        }
 
        ret = pinconf_generic_parse_dt_config(np, pctldev, &configs,
                                              &num_configs);
        if (ret < 0) {
-               dev_err(dev, "could not parse node property\n");
+               dev_err(dev, "%s: could not parse node property\n",
+                       of_node_full_name(np));
                return ret;
        }
 
@@ -309,21 +326,7 @@ int pinconf_generic_dt_subnode_to_map(struct pinctrl_dev *pctldev,
        if (num_configs)
                reserve++;
 
-       ret = of_property_count_strings(np, "pins");
-       if (ret < 0) {
-               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;
+       reserve *= strings_count;
 
        ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps,
                        num_maps, reserve);
@@ -367,15 +370,22 @@ int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev,
        *map = NULL;
        *num_maps = 0;
 
+       ret = pinconf_generic_dt_subnode_to_map(pctldev, np_config, map,
+                                               &reserved_maps, num_maps, type);
+       if (ret < 0)
+               goto exit;
+
        for_each_child_of_node(np_config, np) {
                ret = pinconf_generic_dt_subnode_to_map(pctldev, np, map,
                                        &reserved_maps, num_maps, type);
-               if (ret < 0) {
-                       pinctrl_utils_dt_free_map(pctldev, *map, *num_maps);
-                       return ret;
-               }
+               if (ret < 0)
+                       goto exit;
        }
        return 0;
+
+exit:
+       pinctrl_utils_dt_free_map(pctldev, *map, *num_maps);
+       return ret;
 }
 EXPORT_SYMBOL_GPL(pinconf_generic_dt_node_to_map);