diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2014-09-30 06:23:15 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2014-10-20 03:08:27 -0400 |
commit | eea11b0baa63ed871e16ca4513db56341e4c3598 (patch) | |
tree | c8b91efb556cf97cae7cbc87d63f1852b37e130e /drivers/pinctrl/nomadik | |
parent | 0564f7d946efc2948999cc26cc0831fdf81c895e (diff) |
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>
Diffstat (limited to 'drivers/pinctrl/nomadik')
-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, | |||
891 | const char *function = NULL; | 891 | const char *function = NULL; |
892 | unsigned long *configs; | 892 | unsigned long *configs; |
893 | unsigned int nconfigs = 0; | 893 | unsigned int nconfigs = 0; |
894 | bool has_config = 0; | ||
895 | struct property *prop; | 894 | struct property *prop; |
896 | struct device_node *np_config; | ||
897 | 895 | ||
898 | ret = of_property_read_string(np, "function", &function); | 896 | ret = of_property_read_string(np, "function", &function); |
899 | if (ret >= 0) { | 897 | if (ret >= 0) { |
@@ -917,17 +915,7 @@ static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev, | |||
917 | } | 915 | } |
918 | 916 | ||
919 | ret = pinconf_generic_parse_dt_config(np, &configs, &nconfigs); | 917 | ret = pinconf_generic_parse_dt_config(np, &configs, &nconfigs); |
920 | if (nconfigs) | 918 | if (nconfigs) { |
921 | has_config = 1; | ||
922 | np_config = of_parse_phandle(np, "ste,config", 0); | ||
923 | if (np_config) { | ||
924 | ret = pinconf_generic_parse_dt_config(np_config, &configs, | ||
925 | &nconfigs); | ||
926 | if (ret) | ||
927 | goto exit; | ||
928 | has_config |= nconfigs; | ||
929 | } | ||
930 | if (has_config) { | ||
931 | const char *gpio_name; | 919 | const char *gpio_name; |
932 | const char *pin; | 920 | const char *pin; |
933 | 921 | ||