aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBanajit Goswami <banajit.g@samsung.com>2010-05-20 03:21:32 -0400
committerBen Dooks <ben-linux@fluff.org>2010-05-20 06:47:32 -0400
commit5b7d7b22dc8469fbe1ca10b2adeabb70639bde01 (patch)
tree8598d62d8e40fae729e3034d0c7a21beeea6ab58 /arch
parenta0cce45581d1857b057f674ff118197392031559 (diff)
ARM: S5PV210: Add Watchdog support for S5PV210
This patch adds support for Watchdog timer for Samsung S5PV210. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5pv210/Kconfig4
-rw-r--r--arch/arm/mach-s5pv210/include/mach/map.h3
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkc110.c1
-rw-r--r--arch/arm/mach-s5pv210/mach-smdkv210.c1
4 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 7601c28e240b..231c48513156 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -25,6 +25,8 @@ config MACH_SMDKV210
25 bool "SMDKV210" 25 bool "SMDKV210"
26 select CPU_S5PV210 26 select CPU_S5PV210
27 select ARCH_SPARSEMEM_ENABLE 27 select ARCH_SPARSEMEM_ENABLE
28 select S3C_DEV_WDT
29 select HAVE_S3C2410_WATCHDOG
28 help 30 help
29 Machine support for Samsung SMDKV210 31 Machine support for Samsung SMDKV210
30 32
@@ -32,6 +34,8 @@ config MACH_SMDKC110
32 bool "SMDKC110" 34 bool "SMDKC110"
33 select CPU_S5PV210 35 select CPU_S5PV210
34 select ARCH_SPARSEMEM_ENABLE 36 select ARCH_SPARSEMEM_ENABLE
37 select S3C_DEV_WDT
38 select HAVE_S3C2410_WATCHDOG
35 help 39 help
36 Machine support for Samsung SMDKC110 40 Machine support for Samsung SMDKC110
37 S5PC110(MCP) is one of package option of S5PV210 41 S5PC110(MCP) is one of package option of S5PV210
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 5adcb9f26e44..1131553c6e78 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -32,6 +32,8 @@
32 32
33#define S5PV210_PA_SYSTIMER (0xE2600000) 33#define S5PV210_PA_SYSTIMER (0xE2600000)
34 34
35#define S5PV210_PA_WATCHDOG (0xE2700000)
36
35#define S5PV210_PA_UART (0xE2900000) 37#define S5PV210_PA_UART (0xE2900000)
36 38
37#define S5P_PA_UART0 (S5PV210_PA_UART + 0x0) 39#define S5P_PA_UART0 (S5PV210_PA_UART + 0x0)
@@ -78,5 +80,6 @@
78/* compatibiltiy defines. */ 80/* compatibiltiy defines. */
79#define S3C_PA_UART S5PV210_PA_UART 81#define S3C_PA_UART S5PV210_PA_UART
80#define S3C_PA_IIC S5PV210_PA_IIC0 82#define S3C_PA_IIC S5PV210_PA_IIC0
83#define S3C_PA_WDT S5PV210_PA_WATCHDOG
81 84
82#endif /* __ASM_ARCH_MAP_H */ 85#endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index 6f9fd3274e2e..4c8903c6d104 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -74,6 +74,7 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
74static struct platform_device *smdkc110_devices[] __initdata = { 74static struct platform_device *smdkc110_devices[] __initdata = {
75 &s5pv210_device_iis0, 75 &s5pv210_device_iis0,
76 &s5pv210_device_ac97, 76 &s5pv210_device_ac97,
77 &s3c_device_wdt,
77}; 78};
78 79
79static void __init smdkc110_map_io(void) 80static void __init smdkc110_map_io(void)
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 3c29e18528a5..d65ab2a94929 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -74,6 +74,7 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
74static struct platform_device *smdkv210_devices[] __initdata = { 74static struct platform_device *smdkv210_devices[] __initdata = {
75 &s5pv210_device_iis0, 75 &s5pv210_device_iis0,
76 &s5pv210_device_ac97, 76 &s5pv210_device_ac97,
77 &s3c_device_wdt,
77}; 78};
78 79
79static void __init smdkv210_map_io(void) 80static void __init smdkv210_map_io(void)