From e336780cc3ddbf48b8d3088276497bd076afaa78 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 25 Jun 2021 09:25:31 +0200 Subject: pinctrl: Find controller node first The pinctrl controller node is the first parent node that has a compatible property. Use that information to find the node without iterating up to the root node. Signed-off-by: Sascha Hauer Link: https://lore.barebox.org/20210625072540.32717-11-s.hauer@pengutronix.de Signed-off-by: Sascha Hauer --- drivers/pinctrl/pinctrl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'drivers/pinctrl') diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c index b36521ef83..84ac61f2d9 100644 --- a/drivers/pinctrl/pinctrl.c +++ b/drivers/pinctrl/pinctrl.c @@ -85,12 +85,15 @@ static int pinctrl_config_one(struct device_node *np) pinctrl_node = pinctrl_node->parent; if (!pinctrl_node) return -ENODEV; - pdev = find_pinctrl(pinctrl_node); - if (pdev) + if (of_get_property(pinctrl_node, "compatible", NULL)) break; } - return pdev->ops->set_state(pdev, np); + pdev = find_pinctrl(pinctrl_node); + if (pdev) + return pdev->ops->set_state(pdev, np); + else + return -ENODEV; } int of_pinctrl_select_state(struct device_node *np, const char *name) -- cgit v1.2.3