diff options
author | Robert Jarzmik <robert.jarzmik@free.fr> | 2016-09-26 03:21:51 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-15 07:42:56 -0500 |
commit | 78e2d9405e2ddb2c5c5c1f5dc9ead81191277c70 (patch) | |
tree | 1d2e0d86f87c63439ec3dd2b86e7a326ee7e11c7 /arch/arm/mach-pxa | |
parent | 596ff0afbe8e2e61fdb5cf222b8d72545af77e4e (diff) |
ARM: pxa: fix pxa25x interrupt init
commit e413bd33ac44b6d0bebc0ef2ac19cbe7558a7303 upstream.
In the device-tree case, the root interrupt controller cannot be
accessed through the 6th coprocessor, contrary to pxa27x and pxa3xx
architectures.
Fix it to behave as in non-devicetree builds.
Fixes: 32f17997c130 ("ARM: pxa: remove irq init from dt machines")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 12b94357fbc1..c725baf119e1 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -156,7 +156,7 @@ static int __init __init | |||
156 | pxa25x_dt_init_irq(struct device_node *node, struct device_node *parent) | 156 | pxa25x_dt_init_irq(struct device_node *node, struct device_node *parent) |
157 | { | 157 | { |
158 | pxa_dt_irq_init(pxa25x_set_wake); | 158 | pxa_dt_irq_init(pxa25x_set_wake); |
159 | set_handle_irq(ichp_handle_irq); | 159 | set_handle_irq(icip_handle_irq); |
160 | 160 | ||
161 | return 0; | 161 | return 0; |
162 | } | 162 | } |