diff options
| author | Atul Dahiya <atul.dahiya@samsung.com> | 2010-07-21 17:36:02 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-05 18:31:01 +0900 |
| commit | f5807269ea1fd93e9306191247fd67400ea5f66c (patch) | |
| tree | d4496405c1645311f7a549a42decbedd40af10e9 | |
| parent | 976a62f21940a3a5e3978cb4b6394a21484d4264 (diff) | |
| download | linux-3.10-f5807269ea1fd93e9306191247fd67400ea5f66c.tar.gz linux-3.10-f5807269ea1fd93e9306191247fd67400ea5f66c.tar.bz2 linux-3.10-f5807269ea1fd93e9306191247fd67400ea5f66c.zip | |
ARM: S5PV210: Add RTC support for S5PV210 and S5PC110
This patch adds support RTC driver for Samsung S5PV210/S5PC110.
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-s5pv210/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/map.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig index 12a2c6b6d8b..18270d84890 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig @@ -81,7 +81,9 @@ config MACH_SMDKC110 select CPU_S5PV210 select ARCH_SPARSEMEM_ENABLE select SAMSUNG_DEV_IDE + select S3C_DEV_RTC select S3C_DEV_WDT + select HAVE_S3C_RTC select HAVE_S3C2410_WATCHDOG select S5PV210_SETUP_IDE help @@ -109,10 +111,12 @@ config MACH_SMDKV210 select SAMSUNG_DEV_IDE select SAMSUNG_DEV_KEYPAD select SAMSUNG_DEV_TS + select S3C_DEV_RTC select S3C_DEV_WDT - select S5PV210_SETUP_KEYPAD + select HAVE_S3C_RTC select HAVE_S3C2410_WATCHDOG select S5PV210_SETUP_IDE + select S5PV210_SETUP_KEYPAD select S5PV210_SETUP_SDHCI help Machine support for Samsung SMDKV210 diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 9f6c2ed2812..986b285fa57 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h @@ -45,6 +45,7 @@ #define S5PV210_PA_WATCHDOG (0xE2700000) +#define S5PV210_PA_RTC (0xE2800000) #define S5PV210_PA_UART (0xE2900000) #define S5P_PA_UART0 (S5PV210_PA_UART + 0x0) @@ -106,6 +107,7 @@ #define S3C_PA_IIC1 S5PV210_PA_IIC1 #define S3C_PA_IIC2 S5PV210_PA_IIC2 #define S3C_PA_FB S5PV210_PA_FB +#define S3C_PA_RTC S5PV210_PA_RTC #define S3C_PA_WDT S5PV210_PA_WATCHDOG #define SAMSUNG_PA_ADC S5PV210_PA_ADC diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index 723e6078b97..4816facce63 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c @@ -80,6 +80,7 @@ static struct platform_device *smdkc110_devices[] __initdata = { &s5pv210_device_iis0, &s5pv210_device_ac97, &s3c_device_cfcon, + &s3c_device_rtc, &s3c_device_wdt, }; diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index d20adf7407b..a6c504ec47e 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c @@ -108,6 +108,7 @@ static struct platform_device *smdkv210_devices[] __initdata = { &s3c_device_hsmmc2, &s3c_device_hsmmc3, &samsung_device_keypad, + &s3c_device_rtc, &s3c_device_ts, &s3c_device_wdt, }; |