diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
commit | ed039cd72bfe7cf897fc195dd9cfec0bfa359222 (patch) | |
tree | ff64b841e6245817d987be35c488fbf747560d95 /drivers/pinctrl/pinctrl.c | |
parent | 6d7fae1e97d67b635a972b0f1f5c6a140c596e95 (diff) | |
parent | 03d601d58f4d6228bcb67e6035d4ede7b1d99ae3 (diff) | |
download | barebox-ed039cd72bfe7cf897fc195dd9cfec0bfa359222.tar.gz barebox-ed039cd72bfe7cf897fc195dd9cfec0bfa359222.tar.xz |
Merge branch 'for-next/omap-drivers'
Diffstat (limited to 'drivers/pinctrl/pinctrl.c')
-rw-r--r-- | drivers/pinctrl/pinctrl.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c index 7f76d5a681..8963ac75c0 100644 --- a/drivers/pinctrl/pinctrl.c +++ b/drivers/pinctrl/pinctrl.c @@ -51,7 +51,7 @@ static int pinctrl_config_one(struct device_node *np) return pdev->ops->set_state(pdev, np); } -int pinctrl_select_state(struct device_d *dev, const char *name) +int of_pinctrl_select_state(struct device_node *np, const char *name) { int state, ret; char *propname; @@ -59,13 +59,9 @@ int pinctrl_select_state(struct device_d *dev, const char *name) const __be32 *list; int size, config; phandle phandle; - struct device_node *np_config, *np; + struct device_node *np_config; const char *statename; - np = dev->device_node; - if (!np) - return 0; - if (!of_find_property(np, "pinctrl-0", NULL)) return 0; @@ -127,6 +123,22 @@ err: return ret; } +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) +{ + struct device_node *np; + + np = dev->device_node; + if (!np) + return 0; + + return of_pinctrl_select_state(np, name); +} + int pinctrl_select_state_default(struct device_d *dev) { return pinctrl_select_state(dev, "default"); |