aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s5pc100/Kconfig2
-rw-r--r--arch/arm/mach-s5pc100/include/mach/map.h2
-rw-r--r--arch/arm/mach-s5pc100/mach-smdkc100.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index cd7f4e95d23..25ca7c686e7 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -57,6 +57,7 @@ config MACH_SMDKC100
57 select S3C_DEV_HSMMC1 57 select S3C_DEV_HSMMC1
58 select S3C_DEV_HSMMC2 58 select S3C_DEV_HSMMC2
59 select SAMSUNG_DEV_KEYPAD 59 select SAMSUNG_DEV_KEYPAD
60 select S3C_DEV_RTC
60 select SAMSUNG_DEV_TS 61 select SAMSUNG_DEV_TS
61 select S3C_DEV_WDT 62 select S3C_DEV_WDT
62 select HAVE_S3C2410_WATCHDOG 63 select HAVE_S3C2410_WATCHDOG
@@ -65,6 +66,7 @@ config MACH_SMDKC100
65 select S5PC100_SETUP_IDE 66 select S5PC100_SETUP_IDE
66 select S5PC100_SETUP_KEYPAD 67 select S5PC100_SETUP_KEYPAD
67 select S5PC100_SETUP_SDHCI 68 select S5PC100_SETUP_SDHCI
69 select HAVE_S3C_RTC
68 help 70 help
69 Machine support for the Samsung SMDKC100 71 Machine support for the Samsung SMDKC100
70 72
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index 809ff90824c..c018697e79b 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -75,6 +75,7 @@
75#define S5PC100_PA_SYSTIMER (0xEA100000) 75#define S5PC100_PA_SYSTIMER (0xEA100000)
76 76
77#define S5PC100_PA_WATCHDOG (0xEA200000) 77#define S5PC100_PA_WATCHDOG (0xEA200000)
78#define S5PC100_PA_RTC (0xEA300000)
78 79
79#define S5PC100_PA_UART (0xEC000000) 80#define S5PC100_PA_UART (0xEC000000)
80 81
@@ -141,6 +142,7 @@
141#define S3C_PA_ONENAND S5PC100_PA_ONENAND 142#define S3C_PA_ONENAND S5PC100_PA_ONENAND
142#define S3C_PA_ONENAND_BUF S5PC100_PA_ONENAND_BUF 143#define S3C_PA_ONENAND_BUF S5PC100_PA_ONENAND_BUF
143#define S3C_SZ_ONENAND_BUF S5PC100_SZ_ONENAND_BUF 144#define S3C_SZ_ONENAND_BUF S5PC100_SZ_ONENAND_BUF
145#define S3C_PA_RTC S5PC100_PA_RTC
144 146
145#define SAMSUNG_PA_ADC S5PC100_PA_TSADC 147#define SAMSUNG_PA_ADC S5PC100_PA_TSADC
146#define SAMSUNG_PA_CFCON S5PC100_PA_CFCON 148#define SAMSUNG_PA_CFCON S5PC100_PA_CFCON
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index a00dd090f1a..83a5d648a98 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -192,6 +192,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {
192 &s5pc100_device_iis0, 192 &s5pc100_device_iis0,
193 &samsung_device_keypad, 193 &samsung_device_keypad,
194 &s5pc100_device_ac97, 194 &s5pc100_device_ac97,
195 &s3c_device_rtc,
195}; 196};
196 197
197static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = { 198static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {