summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2016-09-26 07:21:51 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-15 12:42:56 (GMT)
commit78e2d9405e2ddb2c5c5c1f5dc9ead81191277c70 (patch)
tree1d2e0d86f87c63439ec3dd2b86e7a326ee7e11c7
parent596ff0afbe8e2e61fdb5cf222b8d72545af77e4e (diff)
downloadlinux-78e2d9405e2ddb2c5c5c1f5dc9ead81191277c70.tar.xz
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>
-rw-r--r--arch/arm/mach-pxa/pxa25x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 12b9435..c725baf 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -156,7 +156,7 @@ static int __init __init
pxa25x_dt_init_irq(struct device_node *node, struct device_node *parent)
{
pxa_dt_irq_init(pxa25x_set_wake);
- set_handle_irq(ichp_handle_irq);
+ set_handle_irq(icip_handle_irq);
return 0;
}