[ARM PATCH] 2260/1: Rename IXP2000_IRQ_SWI to reduce user confusion

Patch from Lennert Buytenhek

IXP2000 interrupt source zero is a software-generated interrupt source,
but it is not an SWI in the ARM sense of the word.  Rename the interrupt
source to reduce any confusion.

Signed-off-by: Lennert Buytenhek
Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index efeef1674703dd5faa72de54b3a3b272985c6277..2a13e0f28405d1ad766214d6433ac79c3f26765c 100644 (file)
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -352,7 +352,7 @@ void __init ixp2000_init_irq(void)
         * we mark the reserved IRQs as invalid. This makes
         * our mask/unmask code much simpler.
         */
-       for (irq = IRQ_IXP2000_SWI; irq <= IRQ_IXP2000_THDB3; irq++) {
+       for (irq = IRQ_IXP2000_SOFT_INT; irq <= IRQ_IXP2000_THDB3; irq++) {
                if((1 << irq) & IXP2000_VALID_IRQ_MASK) {
                        set_irq_chip(irq, &ixp2000_irq_chip);
                        set_irq_handler(irq, do_level_IRQ);

diff --git a/include/asm-arm/arch-ixp2000/irqs.h b/include/asm-arm/arch-ixp2000/irqs.h
index c912d13ea64fb0568ccc3f6101b1d93a30c2db20..6ef085909c1031b571af971a0b4e0bcce8130063 100644 (file)
--- a/include/asm-arm/arch-ixp2000/irqs.h
+++ b/include/asm-arm/arch-ixp2000/irqs.h
@@ -28,7 +28,7 @@
  * shift operation instead of having to map the IRQ number to
  * a HW IRQ number.
  */
-#define        IRQ_IXP2000_SWI                 0 /* soft interrupt */
+#define        IRQ_IXP2000_SOFT_INT            0 /* soft interrupt */
 #define        IRQ_IXP2000_ERRSUM              1 /* OR of all bits in ErrorStatus reg*/
 #define        IRQ_IXP2000_UART                2
 #define        IRQ_IXP2000_GPIO                3