summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-09-12 12:02:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-15 07:17:06 +0200
commit92fd6af3476bffdf53242efc4dc6ef83b2aa22ce (patch)
tree2e94a9a9d2dbf97a1a3a94470ed9d670d7b1d50a /drivers/pinctrl/pinctrl.c
parent03be149952e283ee18688092b7d27701dfab7039 (diff)
downloadbarebox-92fd6af3476bffdf53242efc4dc6ef83b2aa22ce.tar.gz
barebox-92fd6af3476bffdf53242efc4dc6ef83b2aa22ce.tar.xz
pinctrl: fix Kconfig dependencies
- Remove OFDEVICE dependency from PINCTRL. It won't do much then, so add a comment to Kconfig when PINCTRL is selected without OFDEVICE - Let Architectures only select PINCTRL instead of the particular driver. Change the drivers to 'default y if $SOC' to make sure the drivers are still compiled if the corresponding SoC is selected This fixes Kconfig warnings like: warning: (PINCTRL_ARMADA_370 && PINCTRL_ARMADA_XP && PINCTRL_DOVE && PINCTRL_KIRKWOOD) selects PINCTRL which has unmet direct dependencies (OFDEVICE) Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'drivers/pinctrl/pinctrl.c')
-rw-r--r--drivers/pinctrl/pinctrl.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/pinctrl/pinctrl.c b/drivers/pinctrl/pinctrl.c
index 8963ac75c0..d6479b9cd5 100644
--- a/drivers/pinctrl/pinctrl.c
+++ b/drivers/pinctrl/pinctrl.c
@@ -62,6 +62,9 @@ int of_pinctrl_select_state(struct device_node *np, const char *name)
struct device_node *np_config;
const char *statename;
+ if (!IS_ENABLED(CONFIG_PINCTRL))
+ return -ENOSYS;
+
if (!of_find_property(np, "pinctrl-0", NULL))
return 0;
@@ -146,6 +149,9 @@ int pinctrl_select_state_default(struct device_d *dev)
int pinctrl_register(struct pinctrl_device *pdev)
{
+ if (!IS_ENABLED(CONFIG_PINCTRL))
+ return -ENOSYS;
+
BUG_ON(!pdev->dev->device_node);
list_add_tail(&pdev->list, &pinctrl_list);