niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

pinctrl: nomadik: refactor DT parser to take two paths

Browse source 
We refactor the DT parser to look for either a config or a
function and then look for further nodes and reserve maps,
not the two things mixed up like prior to this patch.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2014-09-29 16:54:14 +02:00
parent 6e9b1c351d
commit c2f6d059ab
1 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
drivers/pinctrl/nomadik/pinctrl-nomadik.c
View file

@ -1505,51 +1505,55 @@ static int nmk_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
const char *function = NULL; const char *function = NULL;
unsigned long configs = 0; unsigned long configs = 0;
bool has_config = 0; bool has_config = 0;
unsigned reserve = 0;
struct property *prop; struct property *prop;
const char *group, *gpio_name; const char *group, *gpio_name;
struct device_node *np_config; struct device_node *np_config;
ret = of_property_read_string(np, "ste,function", &function); ret = of_property_read_string(np, "ste,function", &function);
if (ret >= 0) if (ret >= 0) {
reserve = 1; ret = of_property_count_strings(np, "ste,pins");
if (ret < 0)
goto exit;
has_config = nmk_pinctrl_dt_get_config(np, &configs); ret = pinctrl_utils_reserve_map(pctldev, map,
reserved_maps,
num_maps, ret);
if (ret < 0)
goto exit;
np_config = of_parse_phandle(np, "ste,config", 0); of_property_for_each_string(np, "ste,pins", prop, group) {
if (np_config)
has_config |= nmk_pinctrl_dt_get_config(np_config, &configs);
ret = of_property_count_strings(np, "ste,pins");
if (ret < 0)
goto exit;
if (has_config)
reserve++;
reserve *= ret;
ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps, reserve);
if (ret < 0)
goto exit;
of_property_for_each_string(np, "ste,pins", prop, group) {
if (function) {
ret = nmk_dt_add_map_mux(map, reserved_maps, num_maps, ret = nmk_dt_add_map_mux(map, reserved_maps, num_maps,
group, function); group, function);
if (ret < 0) if (ret < 0)
goto exit; goto exit;
} }
if (has_config) { }
has_config = nmk_pinctrl_dt_get_config(np, &configs);
np_config = of_parse_phandle(np, "ste,config", 0);
if (np_config)
has_config |= nmk_pinctrl_dt_get_config(np_config, &configs);
if (has_config) {
ret = of_property_count_strings(np, "ste,pins");
if (ret < 0)
goto exit;
ret = pinctrl_utils_reserve_map(pctldev, map,
reserved_maps,
num_maps, ret);
if (ret < 0)
goto exit;
of_property_for_each_string(np, "ste,pins", prop, group) {
gpio_name = nmk_find_pin_name(pctldev, group); gpio_name = nmk_find_pin_name(pctldev, group);
ret = nmk_dt_add_map_configs(map, reserved_maps, num_maps, ret = nmk_dt_add_map_configs(map, reserved_maps,
gpio_name, &configs, 1); num_maps,
gpio_name, &configs, 1);
if (ret < 0) if (ret < 0)
goto exit; goto exit;
} }
} }
exit: exit:
return ret; return ret;
} }