ARM: ux500: !CONFIG_OF build error drivers/gpio/gpio-nomadik.c

ARM: ux500: !CONFIG_OF build error drivers/gpio/gpio-nomadik.c

[Arnd Bergmann]

a60b57e "ddrivers/gpio: gpio-nomadik: Add support for irqdomains" broke
building with CONFIG_OF_GPIO disabled. 

Without this patch, building nhk8815_defconfig results in:

/home/arnd/linux-arm/drivers/gpio/gpio-nomadik.c: In function 'nmk_gpio_probe':
/home/arnd/linux-arm/drivers/gpio/gpio-nomadik.c:1238:6: error: 'struct gpio_chip' has no member named 'of_node'
make[3]: *** [drivers/gpio/gpio-nomadik.o] Error 1
make[2]: *** [drivers/gpio] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [drivers] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [sub-make] Error 2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
If I hear no complaints, I'd like to apply this patch on the ux500/gpio branch.

diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c
index 9b126b6..1352f33 100644
--- a/drivers/gpio/gpio-nomadik.c
+++ b/drivers/gpio/gpio-nomadik.c
@@ -1235,7 +1235,9 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 	nmk_chip->lowemi = readl_relaxed(nmk_chip->addr + NMK_GPIO_LOWEMI);
 	clk_disable(nmk_chip->clk);
 
+#ifdef CONFIG_OF_GPIO
 	chip->of_node = np;
+#endif
 
 	ret = gpiochip_add(&nmk_chip->chip);
 	if (ret)

ARM: ux500: !CONFIG_OF build error drivers/gpio/gpio-nomadik.c

[Linus Walleij]

On Mon, May 7, 2012 at 5:51 PM, Arnd Bergmann <arnd@arndb.de> wrote:

> a60b57e "ddrivers/gpio: gpio-nomadik: Add support for irqdomains" broke
> building with CONFIG_OF_GPIO disabled.
>
> Without this patch, building nhk8815_defconfig results in:
>
> /home/arnd/linux-arm/drivers/gpio/gpio-nomadik.c: In function 'nmk_gpio_probe':
> /home/arnd/linux-arm/drivers/gpio/gpio-nomadik.c:1238:6: error: 'struct gpio_chip' has no member named 'of_node'
> make[3]: *** [drivers/gpio/gpio-nomadik.o] Error 1
> make[2]: *** [drivers/gpio] Error 2
> make[2]: *** Waiting for unfinished jobs....
> make[1]: *** [drivers] Error 2
> make[1]: *** Waiting for unfinished jobs....
> make: *** [sub-make] Error 2
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> If I hear no complaints, I'd like to apply this patch on the ux500/gpio branch.

Sure! However I'm floating some patch moving gpio/gpio-nomadik.c to
pinctrl/pinctrl-nomadik.c so prepare to handle that merge conflict when
pulling that in.

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

ARM: ux500: !CONFIG_OF build error drivers/gpio/gpio-nomadik.c

[Arnd Bergmann]

On Wednesday 09 May 2012, Linus Walleij wrote:
> Sure! However I'm floating some patch moving gpio/gpio-nomadik.c to
> pinctrl/pinctrl-nomadik.c so prepare to handle that merge conflict when
> pulling that in.
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>

In that case, would it be easier if you apply the patch on your branch?

	Arnd

ARM: ux500: !CONFIG_OF build error drivers/gpio/gpio-nomadik.c

[Linus Walleij]

On Wed, May 9, 2012 at 3:48 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wednesday 09 May 2012, Linus Walleij wrote:
>> Sure! However I'm floating some patch moving gpio/gpio-nomadik.c to
>> pinctrl/pinctrl-nomadik.c so prepare to handle that merge conflict when
>> pulling that in.
>>
>> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> In that case, would it be easier if you apply the patch on your branch?

OK I've applied it! I have some review comments to address
I think then it'll be ready for a pull request.

Linus