aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-20 08:42:47 -0500
committerLinus Walleij <linus.walleij@linaro.org>2012-11-21 02:55:22 -0500
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 04574308ea89..fbb37154471c 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)
816 goto err_no_chip; 816 goto err_no_chip;
817 } 817 }
818 818
819 /* Spawn pin controller device as child of the GPIO */
820 err = platform_device_register(plat->pinctrl_device);
821 if (err)
822 goto err_no_pinctrl;
823
824 /* 819 /*
825 * Add pinctrl pin ranges, the pin controller must be registered 820 * Add pinctrl pin ranges, the pin controller must be registered
826 * at this point 821 * at this point
@@ -839,7 +834,6 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
839 return 0; 834 return 0;
840 835
841err_no_range: 836err_no_range:
842err_no_pinctrl:
843 err = gpiochip_remove(&gpio->chip); 837 err = gpiochip_remove(&gpio->chip);
844err_no_chip: 838err_no_chip:
845err_no_domain: 839err_no_domain: