diff options
author | Atul Dahiya <atul.dahiya@samsung.com> | 2010-07-21 04:36:02 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-05 05:31:01 -0400 |
commit | f5807269ea1fd93e9306191247fd67400ea5f66c (patch) | |
tree | d4496405c1645311f7a549a42decbedd40af10e9 /arch/arm/mach-s5pv210 | |
parent | 976a62f21940a3a5e3978cb4b6394a21484d4264 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-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 12a2c6b6d8bd..18270d848908 100644 --- a/arch/arm/mach-s5pv210/Kconfig +++ b/arch/arm/mach-s5pv210/Kconfig | |||
@@ -81,7 +81,9 @@ config MACH_SMDKC110 | |||
81 | select CPU_S5PV210 | 81 | select CPU_S5PV210 |
82 | select ARCH_SPARSEMEM_ENABLE | 82 | select ARCH_SPARSEMEM_ENABLE |
83 | select SAMSUNG_DEV_IDE | 83 | select SAMSUNG_DEV_IDE |
84 | select S3C_DEV_RTC | ||
84 | select S3C_DEV_WDT | 85 | select S3C_DEV_WDT |
86 | select HAVE_S3C_RTC | ||
85 | select HAVE_S3C2410_WATCHDOG | 87 | select HAVE_S3C2410_WATCHDOG |
86 | select S5PV210_SETUP_IDE | 88 | select S5PV210_SETUP_IDE |
87 | help | 89 | help |
@@ -109,10 +111,12 @@ config MACH_SMDKV210 | |||
109 | select SAMSUNG_DEV_IDE | 111 | select SAMSUNG_DEV_IDE |
110 | select SAMSUNG_DEV_KEYPAD | 112 | select SAMSUNG_DEV_KEYPAD |
111 | select SAMSUNG_DEV_TS | 113 | select SAMSUNG_DEV_TS |
114 | select S3C_DEV_RTC | ||
112 | select S3C_DEV_WDT | 115 | select S3C_DEV_WDT |
113 | select S5PV210_SETUP_KEYPAD | 116 | select HAVE_S3C_RTC |
114 | select HAVE_S3C2410_WATCHDOG | 117 | select HAVE_S3C2410_WATCHDOG |
115 | select S5PV210_SETUP_IDE | 118 | select S5PV210_SETUP_IDE |
119 | select S5PV210_SETUP_KEYPAD | ||
116 | select S5PV210_SETUP_SDHCI | 120 | select S5PV210_SETUP_SDHCI |
117 | help | 121 | help |
118 | Machine support for Samsung SMDKV210 | 122 | 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 9f6c2ed2812f..986b285fa578 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h | |||
@@ -45,6 +45,7 @@ | |||
45 | 45 | ||
46 | #define S5PV210_PA_WATCHDOG (0xE2700000) | 46 | #define S5PV210_PA_WATCHDOG (0xE2700000) |
47 | 47 | ||
48 | #define S5PV210_PA_RTC (0xE2800000) | ||
48 | #define S5PV210_PA_UART (0xE2900000) | 49 | #define S5PV210_PA_UART (0xE2900000) |
49 | 50 | ||
50 | #define S5P_PA_UART0 (S5PV210_PA_UART + 0x0) | 51 | #define S5P_PA_UART0 (S5PV210_PA_UART + 0x0) |
@@ -106,6 +107,7 @@ | |||
106 | #define S3C_PA_IIC1 S5PV210_PA_IIC1 | 107 | #define S3C_PA_IIC1 S5PV210_PA_IIC1 |
107 | #define S3C_PA_IIC2 S5PV210_PA_IIC2 | 108 | #define S3C_PA_IIC2 S5PV210_PA_IIC2 |
108 | #define S3C_PA_FB S5PV210_PA_FB | 109 | #define S3C_PA_FB S5PV210_PA_FB |
110 | #define S3C_PA_RTC S5PV210_PA_RTC | ||
109 | #define S3C_PA_WDT S5PV210_PA_WATCHDOG | 111 | #define S3C_PA_WDT S5PV210_PA_WATCHDOG |
110 | 112 | ||
111 | #define SAMSUNG_PA_ADC S5PV210_PA_ADC | 113 | #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 723e6078b97a..4816facce63c 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 = { | |||
80 | &s5pv210_device_iis0, | 80 | &s5pv210_device_iis0, |
81 | &s5pv210_device_ac97, | 81 | &s5pv210_device_ac97, |
82 | &s3c_device_cfcon, | 82 | &s3c_device_cfcon, |
83 | &s3c_device_rtc, | ||
83 | &s3c_device_wdt, | 84 | &s3c_device_wdt, |
84 | }; | 85 | }; |
85 | 86 | ||
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index d20adf7407bc..a6c504ec47eb 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 = { | |||
108 | &s3c_device_hsmmc2, | 108 | &s3c_device_hsmmc2, |
109 | &s3c_device_hsmmc3, | 109 | &s3c_device_hsmmc3, |
110 | &samsung_device_keypad, | 110 | &samsung_device_keypad, |
111 | &s3c_device_rtc, | ||
111 | &s3c_device_ts, | 112 | &s3c_device_ts, |
112 | &s3c_device_wdt, | 113 | &s3c_device_wdt, |
113 | }; | 114 | }; |