[PATCH] m68k: convert VME irq code

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 23 insertions, 21 deletions

diff --git a/include/asm-m68k/mvme147hw.h b/include/asm-m68k/mvme147hw.h
index f245139f3671..b81043108472 100644
--- a/include/asm-m68k/mvme147hw.h
+++ b/include/asm-m68k/mvme147hw.h
@@ -1,6 +1,8 @@
 #ifndef _MVME147HW_H_
 #define _MVME147HW_H_
 
+#include <asm/irq.h>
+
 typedef struct {
         unsigned char
                 ctrl,
@@ -72,39 +74,39 @@ struct pcc_regs {
 #define PCC_LEVEL_SCSI_PORT     0x04
 #define PCC_LEVEL_SCSI_DMA      0x04
 
-#define PCC_IRQ_AC_FAIL         0x40
-#define PCC_IRQ_BERR            0x41
-#define PCC_IRQ_ABORT           0x42
-/* #define PCC_IRQ_SERIAL       0x43 */
-#define PCC_IRQ_PRINTER         0x47
-#define PCC_IRQ_TIMER1          0x48
-#define PCC_IRQ_TIMER2          0x49
-#define PCC_IRQ_SOFTWARE1       0x4a
-#define PCC_IRQ_SOFTWARE2       0x4b
+#define PCC_IRQ_AC_FAIL         (IRQ_USER+0)
+#define PCC_IRQ_BERR            (IRQ_USER+1)
+#define PCC_IRQ_ABORT           (IRQ_USER+2)
+/* #define PCC_IRQ_SERIAL       (IRQ_USER+3) */
+#define PCC_IRQ_PRINTER         (IRQ_USER+7)
+#define PCC_IRQ_TIMER1          (IRQ_USER+8)
+#define PCC_IRQ_TIMER2          (IRQ_USER+9)
+#define PCC_IRQ_SOFTWARE1       (IRQ_USER+10)
+#define PCC_IRQ_SOFTWARE2       (IRQ_USER+11)
 
 
 #define M147_SCC_A_ADDR         0xfffe3002
 #define M147_SCC_B_ADDR         0xfffe3000
 #define M147_SCC_PCLK           5000000
 
-#define MVME147_IRQ_SCSI_PORT   0x45
-#define MVME147_IRQ_SCSI_DMA    0x46
+#define MVME147_IRQ_SCSI_PORT   (IRQ_USER+0x45)
+#define MVME147_IRQ_SCSI_DMA    (IRQ_USER+0x46)
 
 /* SCC interrupts, for MVME147 */
 
 #define MVME147_IRQ_TYPE_PRIO   0
-#define MVME147_IRQ_SCC_BASE            0x60
-#define MVME147_IRQ_SCCB_TX             0x60
-#define MVME147_IRQ_SCCB_STAT           0x62
-#define MVME147_IRQ_SCCB_RX             0x64
-#define MVME147_IRQ_SCCB_SPCOND         0x66
-#define MVME147_IRQ_SCCA_TX             0x68
-#define MVME147_IRQ_SCCA_STAT           0x6a
-#define MVME147_IRQ_SCCA_RX             0x6c
-#define MVME147_IRQ_SCCA_SPCOND         0x6e
+#define MVME147_IRQ_SCC_BASE            (IRQ_USER+32)
+#define MVME147_IRQ_SCCB_TX             (IRQ_USER+32)
+#define MVME147_IRQ_SCCB_STAT           (IRQ_USER+34)
+#define MVME147_IRQ_SCCB_RX             (IRQ_USER+36)
+#define MVME147_IRQ_SCCB_SPCOND         (IRQ_USER+38)
+#define MVME147_IRQ_SCCA_TX             (IRQ_USER+40)
+#define MVME147_IRQ_SCCA_STAT           (IRQ_USER+42)
+#define MVME147_IRQ_SCCA_RX             (IRQ_USER+44)
+#define MVME147_IRQ_SCCA_SPCOND         (IRQ_USER+46)
 
 #define MVME147_LANCE_BASE      0xfffe1800
-#define MVME147_LANCE_IRQ       0x44
+#define MVME147_LANCE_IRQ       (IRQ_USER+4)
 
 #define ETHERNET_ADDRESS 0xfffe0778