ARM: mach-shmobile: sh7377/G4EVM evt2irq() update

This patch updates the irq numbers on sh7377/G4EVM
to make use of evt2irq() and intcs_evt2irq().

Makes the system cope with an updated INTCS_VECT_BASE.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c
index 33441d58cfa6..b75372e0563f 100644
--- a/arch/arm/mach-shmobile/board-g4evm.c
+++ b/arch/arm/mach-shmobile/board-g4evm.c
@@ -138,8 +138,7 @@ static struct resource usb_host_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 65,
-                .end    = 65,
+                .start  = evt2irq(0x0a20), /* USBHS_USHI0 */
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -180,7 +179,7 @@ static struct resource keysc_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 79,
+                .start  = evt2irq(0x0be0), /* KEYSC_KEY */
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -204,7 +203,7 @@ static struct resource sdhi0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 96,
+                .start  = evt2irq(0x0e00), /* SDHI0 */
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -224,7 +223,7 @@ static struct resource sdhi1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = 100,
+                .start  = evt2irq(0x0e80), /* SDHI1 */
                 .flags  = IORESOURCE_IRQ,
         },
 };