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

Commit 48516804 authored by Shawn Guo's avatar Shawn Guo Committed by Linus Walleij
Browse files

pinctrl: mxs: skip gpio nodes for group creation 



The recent added mxs gpio device tree bindings require gpio nodes
defined under pinctrl node too.  The pinctrl-mxs driver should skip
these node for group parsing and creating.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3b7ac941

drivers/pinctrl/pinctrl-mxs.c

+7 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ static int __devinit mxs_pinctrl_probe_dt(struct platform_device *pdev, 
	struct device_node *np = pdev->dev.of_node;

	struct device_node *child;

	struct mxs_function *f;

	const char *gpio_compat = "fsl,mxs-gpio";

	const char *fn, *fnull = "";

	int i = 0, idxf = 0, idxg = 0;

	int ret;
@@ -407,6 +408,8 @@ static int __devinit mxs_pinctrl_probe_dt(struct platform_device *pdev, 
	/* Count total functions and groups */

	fn = fnull;

	for_each_child_of_node(np, child) {

		if (of_device_is_compatible(child, gpio_compat))

			continue;

		soc->ngroups++;

		/* Skip pure pinconf node */

		if (of_property_read_u32(child, "reg", &val))
@@ -431,6 +434,8 @@ static int __devinit mxs_pinctrl_probe_dt(struct platform_device *pdev, 
	fn = fnull;

	f = &soc->functions[idxf];

	for_each_child_of_node(np, child) {

		if (of_device_is_compatible(child, gpio_compat))

			continue;

		if (of_property_read_u32(child, "reg", &val))

			continue;

		if (strcmp(fn, child->name)) {
@@ -444,6 +449,8 @@ static int __devinit mxs_pinctrl_probe_dt(struct platform_device *pdev, 
	idxf = 0;

	fn = fnull;

	for_each_child_of_node(np, child) {

		if (of_device_is_compatible(child, gpio_compat))

			continue;

		if (of_property_read_u32(child, "reg", &val)) {

			ret = mxs_pinctrl_parse_group(pdev, child,

						      idxg++, NULL);