Skip to contentSkip to conversation

S5P: support generic watchdog timer

PATCH New Minkyu Kang 2 participants 2 messages Jan 18, 2012 – Jan 25, 2012

Subsystems (2)
Arm (32-bit) Arm Samsung Exynos
lore
Share & tools
lore

Minkyu Kang

author
#0 lore raw

PATCH 1/2 S5P: support generic watchdog timer

This patch adds support the generic watchdog timer for s5pc1xx and exynos4

Signed-off-by Minkyu Kang <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
Cc HeungJun, Kim <[email protected]>
---
 arch/arm/cpu/armv7/s5p-common/Makefile       |    1 +
 arch/arm/cpu/armv7/s5p-common/wdt.c          |   59 ++++++++++++++++++++++++++
 arch/arm/include/asm/arch-exynos/watchdog.h  |    6 ++-
 arch/arm/include/asm/arch-s5pc1xx/cpu.h      |    1 +
 arch/arm/include/asm/arch-s5pc1xx/watchdog.h |   58 +++++++++++++++++++++++++
 5 files changed, 124 insertions(+), 1 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/s5p-common/wdt.c
 create mode 100644 arch/arm/include/asm/arch-s5pc1xx/watchdog.h
arch/arm/cpu/armv7/s5p-common/Makefile +1 -0
index 1705399..f975f3f 100644
@@ -28,6 +28,7 @@ LIB	= $(obj)libs5p-common.o
 COBJS-y		+= cpu_info.o
 COBJS-y		+= timer.o
 COBJS-y		+= sromc.o
+COBJS-y		+= wdt.o
 COBJS-$(CONFIG_PWM)	+= pwm.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
arch/arm/cpu/armv7/s5p-common/wdt.c new file +59 -0

59 lines not on this page · raw message

arch/arm/include/asm/arch-exynos/watchdog.h +5 -1
index 3015875..ee0c9c9 100644
@@ -42,12 +42,16 @@
 #define WTCON_INT		(0x1 << WTCON_INTEN_OFFSET)
 
 #ifndef __ASSEMBLY__
-struct exynos4_watchdog {
+struct s5p_watchdog {
 	unsigned int wtcon;
 	unsigned int wtdat;
 	unsigned int wtcnt;
 	unsigned int wtclrint;
 };
+
+/* functions */
+void wdt_stop(void);
+void wdt_start(unsigned int timeout);
 #endif	/* __ASSEMBLY__ */
 
 #endif
arch/arm/include/asm/arch-s5pc1xx/cpu.h +1 -0
index e699fc4..510ead4 100644
@@ -98,6 +98,7 @@ SAMSUNG_BASE(mmc, MMC_BASE)
 SAMSUNG_BASE(sromc, SROMC_BASE)
 SAMSUNG_BASE(timer, PWMTIMER_BASE)
 SAMSUNG_BASE(uart, UART_BASE)
+SAMSUNG_BASE(watchdog, WATCHDOG_BASE)
 #endif
 
 #endif	/* _S5PC1XX_CPU_H */
arch/arm/include/asm/arch-s5pc1xx/watchdog.h new file +58 -0

58 lines not on this page · raw message

Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/2 S5P: support generic watchdog timer

Quoted 6 lines · Minkyu Kang

This patch adds support the generic watchdog timer for s5pc1xx and exynos4

Signed-off-by Minkyu Kang <[email protected]>
Signed-off-by Kyungmin Park <[email protected]>
Cc HeungJun, Kim <[email protected]>

---

Quoted 9 lines
?arch/arm/cpu/armv7/s5p-common/Makefile ? ? ? | ? ?1 +
?arch/arm/cpu/armv7/s5p-common/wdt.c ? ? ? ? ?| ? 59 ++++++++++++++++++++++++++
?arch/arm/include/asm/arch-exynos/watchdog.h ?| ? ?6 ++-
?arch/arm/include/asm/arch-s5pc1xx/cpu.h ? ? ?| ? ?1 +
?arch/arm/include/asm/arch-s5pc1xx/watchdog.h | ? 58 +++++++++++++++++++++++++

?5 files changed, 124 insertions(+), 1 deletions(-) ?create mode 100644 arch/arm/cpu/armv7/s5p-common/wdt.c ?create mode 100644 arch/arm/include/asm/arch-s5pc1xx/watchdog.h

applied to u-boot-samsung.

Minkyu Kang.

Signature · 2 lines
from. prom.
www.promsoft.net