diff options
author | Michal Simek <monstr@monstr.eu> | 2011-12-09 06:26:16 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-01-05 02:22:01 -0500 |
commit | 5a26cd69cc8156df8e8bfac8d656ebaabc62be2c (patch) | |
tree | 278795734210f95e892f33f6fdf75195dc45a9ee /arch/microblaze/kernel/intc.c | |
parent | eecb20720f1b29019725515051e41bc7c079f91f (diff) |
microblaze: Use of_find_compatible_node for timer and intc
Calling of_find_compatible_node instead of calling private code
which does the same.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/intc.c')
-rw-r--r-- | arch/microblaze/kernel/intc.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c index eb41441c7fd0..da33e45deba0 100644 --- a/arch/microblaze/kernel/intc.c +++ b/arch/microblaze/kernel/intc.c | |||
@@ -99,7 +99,7 @@ unsigned int get_irq(struct pt_regs *regs) | |||
99 | 99 | ||
100 | void __init init_IRQ(void) | 100 | void __init init_IRQ(void) |
101 | { | 101 | { |
102 | u32 i, j, intr_type; | 102 | u32 i, intr_type; |
103 | struct device_node *intc = NULL; | 103 | struct device_node *intc = NULL; |
104 | #ifdef CONFIG_SELFMOD_INTC | 104 | #ifdef CONFIG_SELFMOD_INTC |
105 | unsigned int intc_baseaddr = 0; | 105 | unsigned int intc_baseaddr = 0; |
@@ -113,16 +113,7 @@ void __init init_IRQ(void) | |||
113 | 0 | 113 | 0 |
114 | }; | 114 | }; |
115 | #endif | 115 | #endif |
116 | const char * const intc_list[] = { | 116 | intc = of_find_compatible_node(NULL, NULL, "xlnx,xps-intc-1.00.a"); |
117 | "xlnx,xps-intc-1.00.a", | ||
118 | NULL | ||
119 | }; | ||
120 | |||
121 | for (j = 0; intc_list[j] != NULL; j++) { | ||
122 | intc = of_find_compatible_node(NULL, NULL, intc_list[j]); | ||
123 | if (intc) | ||
124 | break; | ||
125 | } | ||
126 | BUG_ON(!intc); | 117 | BUG_ON(!intc); |
127 | 118 | ||
128 | intc_baseaddr = be32_to_cpup(of_get_property(intc, | 119 | intc_baseaddr = be32_to_cpup(of_get_property(intc, |
@@ -140,8 +131,8 @@ void __init init_IRQ(void) | |||
140 | #ifdef CONFIG_SELFMOD_INTC | 131 | #ifdef CONFIG_SELFMOD_INTC |
141 | selfmod_function((int *) arr_func, intc_baseaddr); | 132 | selfmod_function((int *) arr_func, intc_baseaddr); |
142 | #endif | 133 | #endif |
143 | printk(KERN_INFO "%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n", | 134 | printk(KERN_INFO "XPS intc #0 at 0x%08x, num_irq=%d, edge=0x%x\n", |
144 | intc_list[j], intc_baseaddr, nr_irq, intr_type); | 135 | intc_baseaddr, nr_irq, intr_mask); |
145 | 136 | ||
146 | /* | 137 | /* |
147 | * Disable all external interrupts until they are | 138 | * Disable all external interrupts until they are |