Skip to contentSkip to conversation

ARM: S5PC100: Add Watchdog support for S5PC100

PATCH Superseded Kukjin Kim 2 participants 2 messages Jun 1, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

PATCH 1/1 ARM: S5PC100: Add Watchdog support for S5PC100

From: Banajit Goswami <[email protected]>

This patch adds support for Watchdog timer for Samsung S5PC100.

Signed-off-by Banajit Goswami <[email protected]>
Signed-off-by Kukjin Kim <[email protected]>
---
 arch/arm/mach-s5pc100/Kconfig            |    2 ++
 arch/arm/mach-s5pc100/include/mach/map.h |    3 +++
 arch/arm/mach-s5pc100/mach-smdkc100.c    |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/mach-s5pc100/Kconfig +2 -0
index b2a11df..b63b440 100644
@@ -44,6 +44,8 @@ config MACH_SMDKC100
 	select S3C_DEV_HSMMC
 	select S3C_DEV_HSMMC1
 	select S3C_DEV_HSMMC2
+	select S3C_DEV_WDT
+	select HAVE_S3C2410_WATCHDOG
 	select S5PC100_SETUP_FB_24BPP
 	select S5PC100_SETUP_I2C1
 	select S5PC100_SETUP_SDHCI
arch/arm/mach-s5pc100/include/mach/map.h +3 -0
index cadae43..7671baa 100644
@@ -72,6 +72,8 @@
 
 #define S5PC100_PA_SYSTIMER	(0xEA100000)
 
+#define S5PC100_PA_WDT		(0xEA200000)
+
 #define S5PC100_PA_UART		(0xEC000000)
 
 #define S5P_PA_UART0		(S5PC100_PA_UART + 0x0)

@@ -131,6 +133,7 @@
 #define S3C_PA_HSMMC2		S5PC100_PA_HSMMC(2)
 #define S3C_PA_KEYPAD		S5PC100_PA_KEYPAD
 #define S3C_PA_TSADC		S5PC100_PA_TSADC
+#define S3C_PA_WDT		S5PC100_PA_WDT
 #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
arch/arm/mach-s5pc100/mach-smdkc100.c +1 -0
index af22f82..6fc0bff 100644
@@ -156,6 +156,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {
 	&s3c_device_hsmmc0,
 	&s3c_device_hsmmc1,
 	&s3c_device_hsmmc2,
+	&s3c_device_wdt,
 	&smdkc100_lcd_powerdev,
 	&s5pc100_device_iis0,
 	&s5pc100_device_ac97,
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 1/1 ARM: S5PC100: Add Watchdog support for S5PC100

Quoted 17 lines · Kukjin Kim

From: Banajit Goswami <[email protected]>

This patch adds support for Watchdog timer for Samsung S5PC100.

Signed-off-by Banajit Goswami <[email protected]>
Signed-off-by Kukjin Kim <[email protected]>
---
 arch/arm/mach-s5pc100/Kconfig            |    2 ++
 arch/arm/mach-s5pc100/include/mach/map.h |    3 +++
 arch/arm/mach-s5pc100/mach-smdkc100.c    |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/mach-s5pc100/Kconfig +0 -0
index b2a11df..b63b440 100644

arch/arm/mach-s5pc100/Kconfig config MACH_SMDKC100 · line 48

Quoted 5 lines
arch/arm/mach-s5pc100/Kconfig +2 -0
@@ -44,6 +44,8 @@ config MACH_SMDKC100
 	select S3C_DEV_HSMMC
 	select S3C_DEV_HSMMC1
 	select S3C_DEV_HSMMC2
+	select S3C_DEV_WDT
+	select HAVE_S3C2410_WATCHDOG

Hmm, HAVE_S3C2410_WATCHDOG should probably be property fo the SoC an the board only needs to select S3C_DEV_WDT.

Quoted 43 lines
arch/arm/mach-s5pc100/Kconfig +0 -0
 	select S5PC100_SETUP_FB_24BPP
 	select S5PC100_SETUP_I2C1
 	select S5PC100_SETUP_SDHCI
arch/arm/mach-s5pc100/include/mach/map.h +3 -0
index cadae43..7671baa 100644
@@ -72,6 +72,8 @@
 
 #define S5PC100_PA_SYSTIMER	(0xEA100000)
 
+#define S5PC100_PA_WDT		(0xEA200000)
+
 #define S5PC100_PA_UART		(0xEC000000)
 
 #define S5P_PA_UART0		(S5PC100_PA_UART + 0x0)

@@ -131,6 +133,7 @@
 #define S3C_PA_HSMMC2		S5PC100_PA_HSMMC(2)
 #define S3C_PA_KEYPAD		S5PC100_PA_KEYPAD
 #define S3C_PA_TSADC		S5PC100_PA_TSADC
+#define S3C_PA_WDT		S5PC100_PA_WDT
 #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
arch/arm/mach-s5pc100/mach-smdkc100.c +1 -0
index af22f82..6fc0bff 100644
@@ -156,6 +156,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {
 	&s3c_device_hsmmc0,
 	&s3c_device_hsmmc1,
 	&s3c_device_hsmmc2,
+	&s3c_device_wdt,
 	&smdkc100_lcd_powerdev,
 	&s5pc100_device_iis0,
 	&s5pc100_device_ac97,
Signature · 6 lines
1.6.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.