Merge branch 'devel-stable' into devel

2 files changed, 11 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h
index e1eab3c94aea..a1f13f02c841 100644
--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -67,6 +67,7 @@
 #define S3C64XX_PA_USB_HSOTG    (0x7C000000)
 #define S3C64XX_PA_WATCHDOG     (0x7E004000)
 #define S3C64XX_PA_RTC          (0x7E005000)
+#define S3C64XX_PA_KEYPAD       (0x7E00A000)
 #define S3C64XX_PA_ADC          (0x7E00B000)
 #define S3C64XX_PA_SYSCON       (0x7E00F000)
 #define S3C64XX_PA_AC97         (0x7F001000)
@@ -86,6 +87,9 @@
 #define S3C64XX_SZ_GPIO         SZ_4K
 
 #define S3C64XX_PA_SDRAM        (0x50000000)
+
+#define S3C64XX_PA_CFCON        (0x70300000)
+
 #define S3C64XX_PA_VIC0         (0x71200000)
 #define S3C64XX_PA_VIC1         (0x71300000)
 
@@ -120,5 +124,7 @@
 #define S3C_PA_WDT              S3C64XX_PA_WATCHDOG
 
 #define SAMSUNG_PA_ADC          S3C64XX_PA_ADC
+#define SAMSUNG_PA_CFCON        S3C64XX_PA_CFCON
+#define SAMSUNG_PA_KEYPAD       S3C64XX_PA_KEYPAD
 
 #endif /* __ASM_ARCH_6400_MAP_H */
diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-clock.h b/arch/arm/mach-s3c64xx/include/mach/regs-clock.h
index 0114eb0c1fe7..05332b998ec0 100644
--- a/arch/arm/mach-s3c64xx/include/mach/regs-clock.h
+++ b/arch/arm/mach-s3c64xx/include/mach/regs-clock.h
@@ -34,6 +34,7 @@
 #define S3C_SCLK_GATE           S3C_CLKREG(0x38)
 #define S3C_MEM0_GATE           S3C_CLKREG(0x3C)
 #define S3C6410_CLK_SRC2        S3C_CLKREG(0x10C)
+#define S3C_MEM_SYS_CFG         S3C_CLKREG(0x120)
 
 /* CLKDIV0 */
 #define S3C6400_CLKDIV0_PCLK_MASK       (0xf << 12)
@@ -154,4 +155,8 @@
 #define S3C6400_CLKSRC_EPLL_MOUT_SHIFT  (2)
 #define S3C6400_CLKSRC_MFC              (1 << 4)
 
+/* MEM_SYS_CFG */
+#define MEM_SYS_CFG_INDEP_CF            0x4000
+#define MEM_SYS_CFG_EBI_FIX_PRI_CFCON   0x30
+
 #endif /* _PLAT_REGS_CLOCK_H */