diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c index 7e88391ff3..95e7b0ea96 100644 --- a/drivers/pinctrl/pinctrl.c +++ b/drivers/pinctrl/pinctrl.c @@ -1,17 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * pinctrl.c - barebox pinctrl support * * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * */ #include <common.h> #include <malloc.h> @@ -147,8 +138,8 @@ int of_pinctrl_select_state(struct device_node *np, const char *name) /* Look up the pin configuration node */ np_config = of_find_node_by_phandle(phandle); if (!np_config) { - pr_err("prop %s %s index %i invalid phandle\n", - np->full_name, propname, config); + pr_err("prop %pOF %s index %i invalid phandle\n", + np, propname, config); ret = -EINVAL; goto err; } @@ -170,18 +161,18 @@ int of_pinctrl_select_state_default(struct device_node *np) return of_pinctrl_select_state(np, "default"); } -int pinctrl_select_state(struct device_d *dev, const char *name) +int pinctrl_select_state(struct device *dev, const char *name) { struct device_node *np; - np = dev->device_node; + np = dev->of_node; if (!np) return 0; return of_pinctrl_select_state(np, name); } -int pinctrl_select_state_default(struct device_d *dev) +int pinctrl_select_state_default(struct device *dev) { return pinctrl_select_state(dev, "default"); } @@ -191,11 +182,11 @@ int pinctrl_register(struct pinctrl_device *pdev) if (!IS_ENABLED(CONFIG_PINCTRL)) return -ENOSYS; - BUG_ON(!pdev->dev->device_node); + BUG_ON(!pdev->dev->of_node); list_add_tail(&pdev->list, &pinctrl_list); - pdev->node = pdev->dev->device_node; + pdev->node = pdev->dev->of_node; pinctrl_select_state_default(pdev->dev); |