diff options
Diffstat (limited to 'arch/microblaze/kernel/intc.c')
| -rw-r--r-- | arch/microblaze/kernel/intc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c index 03172c1da770..d61ea33aff7c 100644 --- a/arch/microblaze/kernel/intc.c +++ b/arch/microblaze/kernel/intc.c | |||
| @@ -126,11 +126,8 @@ void __init init_IRQ(void) | |||
| 126 | 0 | 126 | 0 |
| 127 | }; | 127 | }; |
| 128 | #endif | 128 | #endif |
| 129 | static char *intc_list[] = { | 129 | const char * const intc_list[] = { |
| 130 | "xlnx,xps-intc-1.00.a", | 130 | "xlnx,xps-intc-1.00.a", |
| 131 | "xlnx,opb-intc-1.00.c", | ||
| 132 | "xlnx,opb-intc-1.00.b", | ||
| 133 | "xlnx,opb-intc-1.00.a", | ||
| 134 | NULL | 131 | NULL |
| 135 | }; | 132 | }; |
| 136 | 133 | ||
| @@ -141,12 +138,15 @@ void __init init_IRQ(void) | |||
| 141 | } | 138 | } |
| 142 | BUG_ON(!intc); | 139 | BUG_ON(!intc); |
| 143 | 140 | ||
| 144 | intc_baseaddr = *(int *) of_get_property(intc, "reg", NULL); | 141 | intc_baseaddr = be32_to_cpup(of_get_property(intc, |
| 142 | "reg", NULL)); | ||
| 145 | intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE); | 143 | intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE); |
| 146 | nr_irq = *(int *) of_get_property(intc, "xlnx,num-intr-inputs", NULL); | 144 | nr_irq = be32_to_cpup(of_get_property(intc, |
| 145 | "xlnx,num-intr-inputs", NULL)); | ||
| 147 | 146 | ||
| 148 | intr_type = | 147 | intr_type = |
| 149 | *(int *) of_get_property(intc, "xlnx,kind-of-intr", NULL); | 148 | be32_to_cpup(of_get_property(intc, |
| 149 | "xlnx,kind-of-intr", NULL)); | ||
| 150 | if (intr_type >= (1 << (nr_irq + 1))) | 150 | if (intr_type >= (1 << (nr_irq + 1))) |
| 151 | printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n"); | 151 | printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n"); |
| 152 | 152 | ||
