evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: at91/gpio: non-DT builds do not have gpio_chip.of_node field

Browse source 
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>
This commit is contained in:
Nicolas Ferre 2012-02-13 11:26:25 +01:00
parent 21f8187278
commit 5bc067b719
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/mach-at91/gpio.c
View file

@ -496,12 +496,17 @@ postcore_initcall(at91_gpio_debugfs_init);
static void __init at91_gpio_irqdomain(struct at91_gpio_chip *at91_gpio) static void __init at91_gpio_irqdomain(struct at91_gpio_chip *at91_gpio)
{ {
int irq_base; 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); irq_base = irq_alloc_descs(-1, 0, at91_gpio->chip.ngpio, 0);
if (irq_base < 0) if (irq_base < 0)
panic("at91_gpio.%d: error %d: couldn't allocate IRQ numbers.\n", panic("at91_gpio.%d: error %d: couldn't allocate IRQ numbers.\n",
at91_gpio->pioc_idx, irq_base); 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, at91_gpio->chip.ngpio,
irq_base, 0, irq_base, 0,
&irq_domain_simple_ops, NULL); &irq_domain_simple_ops, NULL);