---

yaml --- r: 208736 b: refs/heads/master c: fa9ce74 h: refs/heads/master v: v3
git-mirror · Aug 5, 2010 · b47d239 · b47d239
1 parent ee8a7cc
commit b47d239
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2211f28cdaf416f566ec4af0e431dc04393e9c14
+refs/heads/master: fa9ce74255d9ed5bff4c69e005dcd3a529ad9f66
diff --git a/trunk/arch/arm/mach-s5pc100/Kconfig b/trunk/arch/arm/mach-s5pc100/Kconfig
@@ -57,6 +57,7 @@ config MACH_SMDKC100
 	select S3C_DEV_HSMMC1
 	select S3C_DEV_HSMMC2
 	select SAMSUNG_DEV_KEYPAD
+	select S3C_DEV_RTC
 	select SAMSUNG_DEV_TS
 	select S3C_DEV_WDT
 	select HAVE_S3C2410_WATCHDOG
@@ -65,6 +66,7 @@ config MACH_SMDKC100
 	select S5PC100_SETUP_IDE
 	select S5PC100_SETUP_KEYPAD
 	select S5PC100_SETUP_SDHCI
+	select HAVE_S3C_RTC
 	help
 	  Machine support for the Samsung SMDKC100
 

diff --git a/trunk/arch/arm/mach-s5pc100/include/mach/map.h b/trunk/arch/arm/mach-s5pc100/include/mach/map.h
@@ -75,6 +75,7 @@
 #define S5PC100_PA_SYSTIMER	(0xEA100000)
 
 #define S5PC100_PA_WATCHDOG	(0xEA200000)
+#define S5PC100_PA_RTC		(0xEA300000)
 
 #define S5PC100_PA_UART		(0xEC000000)
 
@@ -141,6 +142,7 @@
 #define S3C_PA_ONENAND		S5PC100_PA_ONENAND
 #define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF
 #define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF
+#define S3C_PA_RTC		S5PC100_PA_RTC
 
 #define SAMSUNG_PA_ADC		S5PC100_PA_TSADC
 #define SAMSUNG_PA_CFCON	S5PC100_PA_CFCON

diff --git a/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c b/trunk/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -192,6 +192,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {
 	&s5pc100_device_iis0,
 	&samsung_device_keypad,
 	&s5pc100_device_ac97,
+	&s3c_device_rtc,
 };
 
 static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {