summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-19 18:31:08 +0400
committerArnd Bergmann <arnd@arndb.de>2013-03-25 15:25:41 +0400
commit67d71344fd09223820eb9de39b597ec29f035e89 (patch)
treec4c49ff1d1879d2fa006a22cef4edaf3adb20ece
parentb426476a5c55a3fa2747810f616e395b31ff029e (diff)
downloadlinux-67d71344fd09223820eb9de39b597ec29f035e89.tar.xz
ARM: sirf: fix prima2 interrupt lookup
We must not read the interrupts property manually but instead use irq_of_parse_and_map() to guarantee that we get the correct interrupt number once we stop using the legacy IRQ domain. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Barry Song <Baohua.Song@csr.com>
-rw-r--r--arch/arm/mach-prima2/timer-prima2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-prima2/timer-prima2.c b/arch/arm/mach-prima2/timer-prima2.c
index 6da584f8a949..982908350b46 100644
--- a/arch/arm/mach-prima2/timer-prima2.c
+++ b/arch/arm/mach-prima2/timer-prima2.c
@@ -16,6 +16,7 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/of.h>
+#include <linux/of_irq.h>
#include <linux/of_address.h>
#include <mach/map.h>
#include <asm/sched_clock.h>
@@ -223,7 +224,6 @@ static struct of_device_id timer_ids[] = {
static void __init sirfsoc_of_timer_map(void)
{
struct device_node *np;
- const unsigned int *intspec;
np = of_find_matching_node(NULL, timer_ids);
if (!np)
@@ -233,9 +233,7 @@ static void __init sirfsoc_of_timer_map(void)
panic("unable to map timer cpu registers\n");
/* Get the interrupts property */
- intspec = of_get_property(np, "interrupts", NULL);
- BUG_ON(!intspec);
- sirfsoc_timer_irq.irq = be32_to_cpup(intspec);
+ sirfsoc_timer_irq.irq = irq_of_parse_and_map(np, 0);
of_node_put(np);
}