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>

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index ce2de0d6f2ebaf2e6f4b50b6cb8a4c9ec98c7d2f..ece8a2dfb8142b9aaec5e8f3b95526be673cb637 100644 (file)
--- 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,

diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index 04574308ea898251c6b8da7bafb905488c29b41c..fbb37154471cae9579acb0cceb3890047ac97bcc 100644 (file)
--- 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:

diff --git a/include/linux/platform_data/pinctrl-coh901.h b/include/linux/platform_data/pinctrl-coh901.h
index 27a23b318cef9fcdc7f199cf320bb65f601ece9f..dfbc65d10484a0d80d8a92b641a78c822fd7ffb3 100644 (file)
--- a/include/linux/platform_data/pinctrl-coh901.h
+++ b/include/linux/platform_data/pinctrl-coh901.h
@@ -13,12 +13,10 @@
  * struct u300_gpio_platform - U300 GPIO platform data
  * @ports: number of GPIO block ports
  * @gpio_base: first GPIO number for this block (use a free range)
- * @pinctrl_device: pin control device to spawn as child
  */
 struct u300_gpio_platform {
        u8 ports;
        int gpio_base;
-       struct platform_device *pinctrl_device;
 };
 
 #endif /* __MACH_U300_GPIO_U300_H */