Merge branch 'sh/dynamic-irq-cleanup' into sh-latest

[mirror_ubuntu-artful-kernel.git] / arch / sh / include / mach-se / mach / se7722.h

diff --git a/arch/sh/include/mach-se/mach/se7722.h b/arch/sh/include/mach-se/mach/se7722.h
index 5508dc42e4d29f4816839cc96a77fc7e2872cb64..637e7ac753f84c8187d7ef1800d673cd3050f071 100644 (file)
--- a/arch/sh/include/mach-se/mach/se7722.h
+++ b/arch/sh/include/mach-se/mach/se7722.h
@@ -13,6 +13,7 @@
  * for more details.
  *
  */
+#include <linux/sh_intc.h>
 #include <asm/addrspace.h>
 
 /* Box specific addresses.  */
@@ -31,7 +32,7 @@
 
 #define PA_PERIPHERAL  0xB0000000
 
-#define PA_PCIC         PA_PERIPHERAL                  /* MR-SHPC-01 PCMCIA */
+#define PA_PCIC         PA_PERIPHERAL          /* MR-SHPC-01 PCMCIA */
 #define PA_MRSHPC       (PA_PERIPHERAL + 0x003fffe0)    /* MR-SHPC-01 PCMCIA controller */
 #define PA_MRSHPC_MW1   (PA_PERIPHERAL + 0x00400000)    /* MR-SHPC-01 memory window base */
 #define PA_MRSHPC_MW2   (PA_PERIPHERAL + 0x00500000)    /* MR-SHPC-01 attribute window base */
@@ -51,7 +52,7 @@
 #define MRSHPC_PCIC_INFO (PA_MRSHPC + 30)
 
 #define PA_LED         (PA_PERIPHERAL + 0x00800000)    /* 8bit LED */
-#define PA_FPGA                (PA_PERIPHERAL + 0x01800000)    /* FPGA base address */
+#define PA_FPGA                (PA_PERIPHERAL + 0x01800000)    /* FPGA base address */
 
 #define PA_LAN         (PA_AREA6_IO + 0)               /* SMC LAN91C111 */
 /* GPIO */
@@ -77,8 +78,8 @@
 #define PORT_HIZCRC     0xA405015CUL
 
 /* IRQ */
-#define IRQ0_IRQ        32
-#define IRQ1_IRQ        33
+#define IRQ0_IRQ        evt2irq(0x600)
+#define IRQ1_IRQ        evt2irq(0x620)
 
 #define SE7722_FPGA_IRQ_USB    0 /* IRQ0 */
 #define SE7722_FPGA_IRQ_SMC    1 /* IRQ0 */