ARM: at91/gpio: non-DT builds do not have gpio_chip.of_node field
authorNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 13 Feb 2012 10:26:25 +0000 (11:26 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 1 Mar 2012 12:29:01 +0000 (13:29 +0100)
Protect build failure in case of non-DT configuration: the
gpio_chip structure does not have a of_node field in case of
!CONFIG_OF_GPIO.

Keep this in a separate patch as it can be reverted if the
field is added for both DT/non-DT cases.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
arch/arm/mach-at91/gpio.c

index 89e683aaae6c3b94ef996bb8a062efdfc06ee2a9..0dc3f5ead7bb8fe115ccf9923cf6a4b1a994f68d 100644 (file)
@@ -496,12 +496,17 @@ postcore_initcall(at91_gpio_debugfs_init);
 static void __init at91_gpio_irqdomain(struct at91_gpio_chip *at91_gpio)
 {
        int irq_base;
+#if defined(CONFIG_OF)
+       struct device_node *of_node = at91_gpio->chip.of_node;
+#else
+       struct device_node *of_node = NULL;
+#endif
 
        irq_base = irq_alloc_descs(-1, 0, at91_gpio->chip.ngpio, 0);
        if (irq_base < 0)
                panic("at91_gpio.%d: error %d: couldn't allocate IRQ numbers.\n",
                        at91_gpio->pioc_idx, irq_base);
-       at91_gpio->domain = irq_domain_add_legacy(at91_gpio->chip.of_node,
+       at91_gpio->domain = irq_domain_add_legacy(of_node,
                                                  at91_gpio->chip.ngpio,
                                                  irq_base, 0,
                                                  &irq_domain_simple_ops, NULL);