diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-09-30 12:23:15 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-10-20 09:08:27 +0200 |
| commit | eea11b0baa63ed871e16ca4513db56341e4c3598 (patch) | |
| tree | c8b91efb556cf97cae7cbc87d63f1852b37e130e | |
| parent | pinctrl: abx500: force-convert to generic config bindings (diff) | |
| download | linux-eea11b0baa63ed871e16ca4513db56341e4c3598.tar.xz linux-eea11b0baa63ed871e16ca4513db56341e4c3598.zip | |
pinctrl: abx500: retire phandle config mechanism
The abx500 pin control driver supported a method of fetching the
generic config from a phandle to a separate node using the
"ste,config" as a phandle. This is not used in any device trees
and not documented in the bindings, so drop this support.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/pinctrl/nomadik/pinctrl-abx500.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 7130cd668c96..acd17a21a159 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -891,9 +891,7 @@ static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev, const char *function = NULL; unsigned long *configs; unsigned int nconfigs = 0; - bool has_config = 0; struct property *prop; - struct device_node *np_config; ret = of_property_read_string(np, "function", &function); if (ret >= 0) { @@ -917,17 +915,7 @@ static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev, } ret = pinconf_generic_parse_dt_config(np, &configs, &nconfigs); - if (nconfigs) - has_config = 1; - np_config = of_parse_phandle(np, "ste,config", 0); - if (np_config) { - ret = pinconf_generic_parse_dt_config(np_config, &configs, - &nconfigs); - if (ret) - goto exit; - has_config |= nconfigs; - } - if (has_config) { + if (nconfigs) { const char *gpio_name; const char *pin; |