Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8604ac34 authored by Linus Walleij's avatar Linus Walleij
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 387923c5

arch/arm/mach-u300/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/pinctrl/pinctrl-coh901.c

+0 −6
Original line number Diff line number Diff line
@@ -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:

include/linux/platform_data/pinctrl-coh901.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */