aboutsummaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-20 14:42:47 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-11-21 08:55:22 +0100
commit8604ac34eb19f7b02f8cf22c787fe30d96ad2651 (patch)
tree5706891598ca7c1ebd80741463d1b971c5139d09 /drivers/pinctrl
parent387923c585ac68ff51e6bf673807438b5e5fdaf3 (diff)
pinctrl/u300/coh901: stop spawning pinctrl from GPIO
Let's stop spawning the pinctrl driver from the GPIO driver, we have these two mechanisms broken apart now, and they can each probe in isolation. If the GPIO driver cannot find its pin controller (pinctrl-u300), the pin controller core will tell it to defer probing. Reviewed-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-coh901.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index 04574308ea8..fbb37154471 100644
--- a/drivers/pinctrl/pinctrl-coh901.c
+++ b/drivers/pinctrl/pinctrl-coh901.c
@@ -816,11 +816,6 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
goto err_no_chip;
}
- /* Spawn pin controller device as child of the GPIO */
- err = platform_device_register(plat->pinctrl_device);
- if (err)
- goto err_no_pinctrl;
-
/*
* Add pinctrl pin ranges, the pin controller must be registered
* at this point
@@ -839,7 +834,6 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
return 0;
err_no_range:
-err_no_pinctrl:
err = gpiochip_remove(&gpio->chip);
err_no_chip:
err_no_domain: