diff options
author | Michal Simek <monstr@monstr.eu> | 2011-03-30 07:13:38 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2011-04-01 03:25:04 -0400 |
commit | 56d448010f4cde5293fe3adfbc636ede827fdfb0 (patch) | |
tree | 7dfc3aae8004af56b6b414498793bad28157d2ee /arch | |
parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) |
microblaze: Fix level/edge irq sensibility
Patches:
"microblaze: Convert to new irq function names"
sha (4adc192ec7d977c74c750320f289af9d61c1caca)
and
"microblaze: Use generic show_interrupts()"
sha(9d61c18b25726306c9231428c17db42e3ff29ba7)
should also setup edge/level in irq_set_chip_and_handler_name
name parameter.
Error log:
~ # cat /proc/interrupts
CPU0
2: 2 Xilinx INTC-Xilinx INTC eth0
3: 2 Xilinx INTC-Xilinx INTC eth0
4: 241 Xilinx INTC-Xilinx INTC timer
6: 108 Xilinx INTC-Xilinx INTC serial
Fixed:
~ # cat /proc/interrupts
CPU0
2: 2 Xilinx INTC-level eth0
3: 2 Xilinx INTC-level eth0
4: 238 Xilinx INTC-edge timer
6: 108 Xilinx INTC-level serial
Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
---
v2: Fix exchanged edge and level
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/kernel/intc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c index 5ba7e162833b..c88f066f41bd 100644 --- a/arch/microblaze/kernel/intc.c +++ b/arch/microblaze/kernel/intc.c | |||
@@ -158,11 +158,11 @@ void __init init_IRQ(void) | |||
158 | for (i = 0; i < nr_irq; ++i) { | 158 | for (i = 0; i < nr_irq; ++i) { |
159 | if (intr_type & (0x00000001 << i)) { | 159 | if (intr_type & (0x00000001 << i)) { |
160 | irq_set_chip_and_handler_name(i, &intc_dev, | 160 | irq_set_chip_and_handler_name(i, &intc_dev, |
161 | handle_edge_irq, intc_dev.name); | 161 | handle_edge_irq, "edge"); |
162 | irq_clear_status_flags(i, IRQ_LEVEL); | 162 | irq_clear_status_flags(i, IRQ_LEVEL); |
163 | } else { | 163 | } else { |
164 | irq_set_chip_and_handler_name(i, &intc_dev, | 164 | irq_set_chip_and_handler_name(i, &intc_dev, |
165 | handle_level_irq, intc_dev.name); | 165 | handle_level_irq, "level"); |
166 | irq_set_status_flags(i, IRQ_LEVEL); | 166 | irq_set_status_flags(i, IRQ_LEVEL); |
167 | } | 167 | } |
168 | } | 168 | } |