Title: [5889] trunk/arch/blackfin: revert IRQ_SW_INT# addition from ipipe merge
- Revision
- 5889
- Author
- vapier
- Date
- 2008-12-18 12:37:19 -0600 (Thu, 18 Dec 2008)
Log Message
revert IRQ_SW_INT# addition from ipipe merge
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/ipipe.c (5888 => 5889)
--- trunk/arch/blackfin/kernel/ipipe.c 2008-12-18 17:55:59 UTC (rev 5888)
+++ trunk/arch/blackfin/kernel/ipipe.c 2008-12-18 18:37:19 UTC (rev 5889)
@@ -77,15 +77,13 @@
__ipipe_core_clock = get_cclk(); /* Fetch this once. */
__ipipe_freq_scale = 1000000000UL / __ipipe_core_clock;
- for (irq = 0; irq < NR_IRQS; irq++) {
- if (irq != IRQ_SW_INT1 && irq != IRQ_SW_INT2)
- ipipe_virtualize_irq(ipipe_root_domain,
- irq,
- (ipipe_irq_handler_t)&asm_do_IRQ,
- NULL,
- &__ipipe_ack_irq,
- IPIPE_HANDLE_MASK | IPIPE_PASS_MASK);
- }
+ for (irq = 0; irq < NR_IRQS; ++irq)
+ ipipe_virtualize_irq(ipipe_root_domain,
+ irq,
+ (ipipe_irq_handler_t)&asm_do_IRQ,
+ NULL,
+ &__ipipe_ack_irq,
+ IPIPE_HANDLE_MASK | IPIPE_PASS_MASK);
}
/*
Modified: trunk/arch/blackfin/mach-bf527/include/mach/irq.h (5888 => 5889)
--- trunk/arch/blackfin/mach-bf527/include/mach/irq.h 2008-12-18 17:55:59 UTC (rev 5888)
+++ trunk/arch/blackfin/mach-bf527/include/mach/irq.h 2008-12-18 18:37:19 UTC (rev 5889)
@@ -121,9 +121,6 @@
#define IRQ_USB_INT2 BFIN_IRQ(54) /* USB_INT2 Interrupt */
#define IRQ_USB_DMA BFIN_IRQ(55) /* USB_DMAINT Interrupt */
-#define IRQ_SW_INT1 BFIN_IRQ(56)
-#define IRQ_SW_INT2 BFIN_IRQ(57)
-
#define SYS_IRQS BFIN_IRQ(63) /* 70 */
#define IRQ_PF0 71
Modified: trunk/arch/blackfin/mach-bf533/include/mach/irq.h (5888 => 5889)
--- trunk/arch/blackfin/mach-bf533/include/mach/irq.h 2008-12-18 17:55:59 UTC (rev 5888)
+++ trunk/arch/blackfin/mach-bf533/include/mach/irq.h 2008-12-18 18:37:19 UTC (rev 5889)
@@ -109,9 +109,6 @@
#define IRQ_MEM_DMA1 29 /*DMA10/11 Interrupt (Memory DMA Stream 1) */
#define IRQ_WATCH 30 /*Watch Dog Timer */
-#define IRQ_SW_INT1 31 /*Software Int 1 */
-#define IRQ_SW_INT2 32 /*Software Int 2 */
-
#define IRQ_PF0 33
#define IRQ_PF1 34
#define IRQ_PF2 35
Modified: trunk/arch/blackfin/mach-bf537/include/mach/irq.h (5888 => 5889)
--- trunk/arch/blackfin/mach-bf537/include/mach/irq.h 2008-12-18 17:55:59 UTC (rev 5888)
+++ trunk/arch/blackfin/mach-bf537/include/mach/irq.h 2008-12-18 18:37:19 UTC (rev 5889)
@@ -96,8 +96,6 @@
#define IRQ_MEM_DMA1 37 /*(Memory DMA Stream 1) */
#define IRQ_PROG_INTB 38 /* PF Ports F (PF15:0) Interrupt B */
#define IRQ_WATCH 38 /*Watch Dog Timer */
-#define IRQ_SW_INT1 40 /* Software Int 1 */
-#define IRQ_SW_INT2 41 /* Software Int 2 */
#define IRQ_PPI_ERROR 42 /*PPI Error Interrupt */
#define IRQ_CAN_ERROR 43 /*CAN Error Interrupt */
Modified: trunk/arch/blackfin/mach-bf548/include/mach/irq.h (5888 => 5889)
--- trunk/arch/blackfin/mach-bf548/include/mach/irq.h 2008-12-18 17:55:59 UTC (rev 5888)
+++ trunk/arch/blackfin/mach-bf548/include/mach/irq.h 2008-12-18 18:37:19 UTC (rev 5889)
@@ -158,11 +158,8 @@
#define IRQ_PINT2 BFIN_IRQ(94) /* PINT2 Interrupt */
#define IRQ_PINT3 BFIN_IRQ(95) /* PINT3 Interrupt */
-#define IRQ_SW_INT1 BFIN_IRQ(96) /*Software Int 1 */
-#define IRQ_SW_INT2 BFIN_IRQ(97) /*Software Int 2 */
+#define SYS_IRQS IRQ_PINT3
-#define SYS_IRQS IRQ_SW_INT2
-
#define BFIN_PA_IRQ(x) ((x) + SYS_IRQS + 1)
#define IRQ_PA0 BFIN_PA_IRQ(0)
#define IRQ_PA1 BFIN_PA_IRQ(1)
Modified: trunk/arch/blackfin/mach-bf561/include/mach/irq.h (5888 => 5889)
--- trunk/arch/blackfin/mach-bf561/include/mach/irq.h 2008-12-18 17:55:59 UTC (rev 5888)
+++ trunk/arch/blackfin/mach-bf561/include/mach/irq.h 2008-12-18 18:37:19 UTC (rev 5889)
@@ -239,9 +239,6 @@
#define IRQ_SUPPLE_0 (IVG_BASE + 62) /* Supplemental interrupt 0 */
#define IRQ_SUPPLE_1 (IVG_BASE + 63) /* supplemental interrupt 1 */
-#define IRQ_SW_INT1 71 /* Software Interrupt 1 */
-#define IRQ_SW_INT2 72 /* Software Interrupt 2 */
-
#define IRQ_PF0 73
#define IRQ_PF1 74
#define IRQ_PF2 75
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
