diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-12-01 01:35:29 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2011-12-01 03:11:55 -0500 |
commit | 2a3267a489f1dc4284b64a4b88c62011946dc7ff (patch) | |
tree | b2e33b58cc6b6220645f05889a6f8e10dbbfe82f /arch/arm/mach-imx/mach-imx6q.c | |
parent | caca6a03d365883564885f2c1da3e88dcf65d139 (diff) |
arm/imx: fix return type of callback passed to of_irq_init()
The of_irq_init() expects the callback passed by .data of of_device_id
return 'int' instead of 'void'. This patch fixes it to have
irq_init_cb() return the correct value, and in turn have the secondary
interrupt controller (gpio in this case) initialized properly and also
eliminate the error message 'of_irq_init: children remain, but no
parents' which was overlooked before.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 8bf5fa349484..eb7531bdfed7 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
@@ -36,7 +36,7 @@ static void __init imx6q_map_io(void) | |||
36 | imx_scu_map_io(); | 36 | imx_scu_map_io(); |
37 | } | 37 | } |
38 | 38 | ||
39 | static void __init imx6q_gpio_add_irq_domain(struct device_node *np, | 39 | static int __init imx6q_gpio_add_irq_domain(struct device_node *np, |
40 | struct device_node *interrupt_parent) | 40 | struct device_node *interrupt_parent) |
41 | { | 41 | { |
42 | static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS - | 42 | static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS - |
@@ -44,6 +44,8 @@ static void __init imx6q_gpio_add_irq_domain(struct device_node *np, | |||
44 | 44 | ||
45 | irq_domain_add_simple(np, gpio_irq_base); | 45 | irq_domain_add_simple(np, gpio_irq_base); |
46 | gpio_irq_base += 32; | 46 | gpio_irq_base += 32; |
47 | |||
48 | return 0; | ||
47 | } | 49 | } |
48 | 50 | ||
49 | static const struct of_device_id imx6q_irq_match[] __initconst = { | 51 | static const struct of_device_id imx6q_irq_match[] __initconst = { |