Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[pandora-kernel.git] / arch / arm / mach-s5p64x0 / include / mach / regs-gpio.h

diff --git a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h b/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
index 88269ec..cfdfa4f 100644 (file)
--- a/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
+++ b/arch/arm/mach-s5p64x0/include/mach/regs-gpio.h
@@ -37,15 +37,32 @@
 #define S5P64X0_SPCON0                 (S5P_VA_GPIO + 0x1A0)
 #define S5P64X0_SPCON0_LCD_SEL_MASK    (0x3 << 0)
 #define S5P64X0_SPCON0_LCD_SEL_RGB     (0x1 << 0)
+#define S5P64X0_SPCON1                 (S5P_VA_GPIO + 0x2B0)
+
+#define S5P64X0_MEM0CONSLP0            (S5P_VA_GPIO + 0x1C0)
+#define S5P64X0_MEM0CONSLP1            (S5P_VA_GPIO + 0x1C4)
+#define S5P64X0_MEM0DRVCON             (S5P_VA_GPIO + 0x1D0)
+#define S5P64X0_MEM1DRVCON             (S5P_VA_GPIO + 0x1D4)
+
+#define S5P64X0_EINT12CON              (S5P_VA_GPIO + 0x200)
+#define S5P64X0_EINT12FLTCON           (S5P_VA_GPIO + 0x220)
+#define S5P64X0_EINT12MASK             (S5P_VA_GPIO + 0x240)
 
 /* External interrupt control registers for group0 */
 
 #define EINT0CON0_OFFSET               (0x900)
+#define EINT0FLTCON0_OFFSET            (0x910)
+#define EINT0FLTCON1_OFFSET            (0x914)
 #define EINT0MASK_OFFSET               (0x920)
 #define EINT0PEND_OFFSET               (0x924)
 
 #define S5P64X0_EINT0CON0              (S5P_VA_GPIO + EINT0CON0_OFFSET)
+#define S5P64X0_EINT0FLTCON0           (S5P_VA_GPIO + EINT0FLTCON0_OFFSET)
+#define S5P64X0_EINT0FLTCON1           (S5P_VA_GPIO + EINT0FLTCON1_OFFSET)
 #define S5P64X0_EINT0MASK              (S5P_VA_GPIO + EINT0MASK_OFFSET)
 #define S5P64X0_EINT0PEND              (S5P_VA_GPIO + EINT0PEND_OFFSET)
 
+#define S5P64X0_SLPEN                  (S5P_VA_GPIO + 0x930)
+#define S5P64X0_SLPEN_USE_xSLP         (1 << 0)
+
 #endif /* __ASM_ARCH_REGS_GPIO_H */