Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: hp6xx evt2irq migration.

Migrate hp6xx to evt2irq backed hwirq lookups.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+6 -4
+2 -1
arch/sh/boards/mach-hp6xx/setup.c
··· 13 13 #include <linux/init.h> 14 14 #include <linux/platform_device.h> 15 15 #include <linux/irq.h> 16 + #include <linux/sh_intc.h> 16 17 #include <sound/sh_dac_audio.h> 17 18 #include <asm/hd64461.h> 18 19 #include <asm/io.h> ··· 36 35 .flags = IORESOURCE_MEM, 37 36 }, 38 37 [2] = { 39 - .start = 77, 38 + .start = evt2irq(0xba0), 40 39 .flags = IORESOURCE_IRQ, 41 40 }, 42 41 };
+4 -3
arch/sh/include/mach-common/mach/hp6xx.h
··· 9 9 * for more details. 10 10 * 11 11 */ 12 + #include <linux/sh_intc.h> 12 13 13 - #define HP680_BTN_IRQ 32 /* IRQ0_IRQ */ 14 - #define HP680_TS_IRQ 35 /* IRQ3_IRQ */ 15 - #define HP680_HD64461_IRQ 36 /* IRQ4_IRQ */ 14 + #define HP680_BTN_IRQ evt2irq(0x600) /* IRQ0_IRQ */ 15 + #define HP680_TS_IRQ evt2irq(0x660) /* IRQ3_IRQ */ 16 + #define HP680_HD64461_IRQ evt2irq(0x680) /* IRQ4_IRQ */ 16 17 17 18 #define DAC_LCD_BRIGHTNESS 0 18 19 #define DAC_SPEAKER_VOLUME 1