diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 19:10:40 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 19:10:40 +0900 |
| commit | b7a5b7acb796e5c950a58a35aee559b284de6e59 (patch) | |
| tree | 2873f14dadaa136598977c24a90246b00143b479 /arch/arm/mach-s5pc100 | |
| parent | f7b4dc7a14b84d5f2ae236a1a2bb211673717c5d (diff) | |
| parent | 459f2a32024b46b7f144999738112eb88654eb0f (diff) | |
| download | kernel_samsung_crespo-b7a5b7acb796e5c950a58a35aee559b284de6e59.zip kernel_samsung_crespo-b7a5b7acb796e5c950a58a35aee559b284de6e59.tar.gz kernel_samsung_crespo-b7a5b7acb796e5c950a58a35aee559b284de6e59.tar.bz2 | |
ARM: Merge next-samsung
Merge branch 'next-samsung' into for-linus/2634-git-updates
Diffstat (limited to 'arch/arm/mach-s5pc100')
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/irqs.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h index 15066df..28aa551 100644 --- a/arch/arm/mach-s5pc100/include/mach/irqs.h +++ b/arch/arm/mach-s5pc100/include/mach/irqs.h @@ -100,9 +100,6 @@ #define S5P_EINT_BASE1 (S5P_IRQ_VIC0(0)) #define S5P_EINT_BASE2 (IRQ_VIC_END + 1) -#define IRQ_EINT(x) ((x) < 16 ? S5P_IRQ_VIC0(x) : \ - (S5P_EINT_BASE2 + (x) - 16)) - #define S3C_IRQ_GPIO_BASE (IRQ_EINT(31) + 1) #define S3C_IRQ_GPIO(x) (S3C_IRQ_GPIO_BASE + (x)) diff --git a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h b/arch/arm/mach-s5pc100/include/mach/regs-gpio.h index 763edebd..dd6295e 100644 --- a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h +++ b/arch/arm/mach-s5pc100/include/mach/regs-gpio.h @@ -60,12 +60,9 @@ #define S5PC100EINT30PEND (S5P_VA_GPIO + 0xF40) #define S5P_EINT_PEND(x) (S5PC100EINT30PEND + ((x) * 0x4)) -#define eint_offset(irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0)) : \ - (((irq) - S5P_EINT_BASE2))) +#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) |