diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-20 14:42:47 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-21 08:55:22 +0100 |
| commit | 8604ac34eb19f7b02f8cf22c787fe30d96ad2651 (patch) | |
| tree | 5706891598ca7c1ebd80741463d1b971c5139d09 /arch/arm/mach-u300 | |
| parent | 387923c585ac68ff51e6bf673807438b5e5fdaf3 (diff) | |
| download | linux-3.10-8604ac34eb19f7b02f8cf22c787fe30d96ad2651.tar.gz linux-3.10-8604ac34eb19f7b02f8cf22c787fe30d96ad2651.tar.bz2 linux-3.10-8604ac34eb19f7b02f8cf22c787fe30d96ad2651.zip | |
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 'arch/arm/mach-u300')
| -rw-r--r-- | arch/arm/mach-u300/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index ce2de0d6f2e..ece8a2dfb81 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -1445,7 +1445,6 @@ static struct platform_device pinctrl_device = { static struct u300_gpio_platform u300_gpio_plat = { .ports = 7, .gpio_base = 0, - .pinctrl_device = &pinctrl_device, }; static struct platform_device gpio_device = { @@ -1589,6 +1588,7 @@ static struct platform_device *platform_devs[] __initdata = { &i2c1_device, &keypad_device, &rtc_device, + &pinctrl_device, &gpio_device, &nand_device, &wdog_device, |