Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f6d059 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: nomadik: refactor DT parser to take two paths 



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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6e9b1c35

drivers/pinctrl/nomadik/pinctrl-nomadik.c

+33 −29
Original line number Diff line number Diff line
@@ -1505,51 +1505,55 @@ static int nmk_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, 
	const char *function = NULL;

	unsigned long configs = 0;

	bool has_config = 0;

	unsigned reserve = 0;

	struct property *prop;

	const char *group, *gpio_name;

	struct device_node *np_config;



	ret = of_property_read_string(np, "ste,function", &function);

	if (ret >= 0)

		reserve = 1;



	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 (ret >= 0) {

		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);

		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) {

		if (function) {

			ret = nmk_dt_add_map_mux(map, reserved_maps, num_maps,

					  group, function);

			if (ret < 0)

				goto exit;

		}

	}



	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);



			ret = nmk_dt_add_map_configs(map, reserved_maps, num_maps,

			ret = nmk_dt_add_map_configs(map, reserved_maps,

						     num_maps,

						     gpio_name, &configs, 1);

			if (ret < 0)

				goto exit;

		}



	}



exit:

	return ret;

}