diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 10:23:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 10:23:57 -0700 |
| commit | b899ebeb05da4287ce845976727e3e83dadd25d5 (patch) | |
| tree | 4eea9d850f0a2704799e226a89971f08d6454e26 /arch/arm/mach-s5pv210/include/mach | |
| parent | 55ddf14b04bfe5afaab892a8fb12164b803f1dd5 (diff) | |
| parent | b7a5b7acb796e5c950a58a35aee559b284de6e59 (diff) | |
Merge branch 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux
* 'for-linus/2634-git-updates' of git://git.fluff.org/bjdooks/linux:
ARM: S5PC100: Fixup cross tree merge problems
ARM: S5P: Fix the platform external interrupt issues.
ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-git
ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-git
ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-git
ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-git
ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-git
ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-git
ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-git
Diffstat (limited to 'arch/arm/mach-s5pv210/include/mach')
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/irqs.h | 14 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 14 |
2 files changed, 11 insertions, 17 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h index 92fc6c7fc06..96895378ea2 100644 --- a/arch/arm/mach-s5pv210/include/mach/irqs.h +++ b/arch/arm/mach-s5pv210/include/mach/irqs.h @@ -118,22 +118,12 @@ #define IRQ_MDNIE3 S5P_IRQ_VIC3(8) #define IRQ_VIC_END S5P_IRQ_VIC3(31) -#define S5P_EINT_16_31_BASE (IRQ_VIC_END + 1) - -#define EINT_MODE S3C_GPIO_SFN(0xf) - -#define IRQ_EINT(x) ((x) < 16 ? ((x) + S5P_IRQ_VIC0(0)) \ - : ((x) + S5P_EINT_16_31_BASE)) +#define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0)) +#define S5P_EINT_BASE2 (IRQ_VIC_END + 1) /* Set the default NR_IRQS */ - #define NR_IRQS (IRQ_EINT(31) + 1) -#define EINT_GPIO_0(x) S5PV210_GPH0(x) -#define EINT_GPIO_1(x) S5PV210_GPH1(x) -#define EINT_GPIO_2(x) S5PV210_GPH2(x) -#define EINT_GPIO_3(x) S5PV210_GPH3(x) - /* Compatibility */ #define IRQ_LCD_FIFO IRQ_LCD0 #define IRQ_LCD_VSYNC IRQ_LCD1 diff --git a/arch/arm/mach-s5pv210/include/mach/regs-gpio.h b/arch/arm/mach-s5pv210/include/mach/regs-gpio.h index 6d068091c36..49e029b4978 100644 --- a/arch/arm/mach-s5pv210/include/mach/regs-gpio.h +++ b/arch/arm/mach-s5pv210/include/mach/regs-gpio.h @@ -27,12 +27,9 @@ #define S5PV210_EINT30PEND (S5P_VA_GPIO + 0xF40) #define S5P_EINT_PEND(x) (S5PV210_EINT30PEND + ((x) * 0x4)) -#define eint_offset(irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0)) \ - : ((irq) - S5P_EINT_16_31_BASE)) +#define EINT_REG_NR(x) (EINT_OFFSET(x) >> 3) -#define EINT_REG_NR(x) (eint_offset(x) >> 3) - -#define eint_irq_to_bit(irq) (1 << (eint_offset(irq) & 0x7)) +#define eint_irq_to_bit(irq) (1 << (EINT_OFFSET(irq) & 0x7)) /* values for S5P_EXTINT0 */ #define S5P_EXTINT_LOWLEV (0x00) @@ -41,4 +38,11 @@ #define S5P_EXTINT_RISEEDGE (0x03) #define S5P_EXTINT_BOTHEDGE (0x04) +#define EINT_MODE S3C_GPIO_SFN(0xf) + +#define EINT_GPIO_0(x) S5PV210_GPH0(x) +#define EINT_GPIO_1(x) S5PV210_GPH1(x) +#define EINT_GPIO_2(x) S5PV210_GPH2(x) +#define EINT_GPIO_3(x) S5PV210_GPH3(x) + #endif /* __ASM_ARCH_REGS_GPIO_H */ |