diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-05-18 10:38:50 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-18 10:38:50 +0400 |
| commit | b6bd263397decbcac5e1c836154a53c14b80f530 (patch) | |
| tree | 4376f5f8425e2146c4dd31bc981535d1ba4521cc | |
| parent | b894701e7c472dbc6267bdde68bd6d35266b8dfc (diff) | |
| download | linux-b6bd263397decbcac5e1c836154a53c14b80f530.tar.xz | |
sh: hp6xx evt2irq migration.
Migrate hp6xx to evt2irq backed hwirq lookups.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/boards/mach-hp6xx/setup.c | 3 | ||||
| -rw-r--r-- | arch/sh/include/mach-common/mach/hp6xx.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c index 8c9add5f4cfa..db34cad1b76c 100644 --- a/arch/sh/boards/mach-hp6xx/setup.c +++ b/arch/sh/boards/mach-hp6xx/setup.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/irq.h> +#include <linux/sh_intc.h> #include <sound/sh_dac_audio.h> #include <asm/hd64461.h> #include <asm/io.h> @@ -35,7 +36,7 @@ static struct resource cf_ide_resources[] = { .flags = IORESOURCE_MEM, }, [2] = { - .start = 77, + .start = evt2irq(0xba0), .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/sh/include/mach-common/mach/hp6xx.h b/arch/sh/include/mach-common/mach/hp6xx.h index bcc301ac12f4..6aaaf8596e6a 100644 --- a/arch/sh/include/mach-common/mach/hp6xx.h +++ b/arch/sh/include/mach-common/mach/hp6xx.h @@ -9,10 +9,11 @@ * for more details. * */ +#include <linux/sh_intc.h> -#define HP680_BTN_IRQ 32 /* IRQ0_IRQ */ -#define HP680_TS_IRQ 35 /* IRQ3_IRQ */ -#define HP680_HD64461_IRQ 36 /* IRQ4_IRQ */ +#define HP680_BTN_IRQ evt2irq(0x600) /* IRQ0_IRQ */ +#define HP680_TS_IRQ evt2irq(0x660) /* IRQ3_IRQ */ +#define HP680_HD64461_IRQ evt2irq(0x680) /* IRQ4_IRQ */ #define DAC_LCD_BRIGHTNESS 0 #define DAC_SPEAKER_VOLUME 1 |