Module Name: src
Committed By: reinoud
Date: Mon May 5 20:31:03 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos4_loc.c exynos5_loc.c files.exynos
src/sys/arch/evbarm/conf: ODROID ODROID-U
Log Message:
exywdt -> exyowdt
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/samsung/exynos4_loc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos5_loc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/ODROID
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/ODROID-U
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/samsung/exynos4_loc.c
diff -u src/sys/arch/arm/samsung/exynos4_loc.c:1.3 src/sys/arch/arm/samsung/exynos4_loc.c:1.4
--- src/sys/arch/arm/samsung/exynos4_loc.c:1.3 Tue Apr 29 16:47:10 2014
+++ src/sys/arch/arm/samsung/exynos4_loc.c Mon May 5 20:31:03 2014
@@ -265,7 +265,7 @@
static const struct exyo_locators exynos4_locators[] = {
{ "mct", OFFANDSIZE(,MCT), NOPORT, IRQ_G0_IRQ, 0 },
- { "exywdt", OFFANDSIZE(,WDT), NOPORT, IRQ_WDT, 0 },
+ { "exyowdt", OFFANDSIZE(,WDT), NOPORT, IRQ_WDT, 0 },
{ "sscom", OFFANDSIZE(,UART0), 0, IRQ_UART0, 0 },
{ "sscom", OFFANDSIZE(,UART1), 1, IRQ_UART1, 0 },
{ "sscom", OFFANDSIZE(,UART2), 2, IRQ_UART2, 0 },
Index: src/sys/arch/arm/samsung/exynos5_loc.c
diff -u src/sys/arch/arm/samsung/exynos5_loc.c:1.2 src/sys/arch/arm/samsung/exynos5_loc.c:1.3
--- src/sys/arch/arm/samsung/exynos5_loc.c:1.2 Tue Apr 29 16:47:10 2014
+++ src/sys/arch/arm/samsung/exynos5_loc.c Mon May 5 20:31:03 2014
@@ -213,7 +213,7 @@
EXYNOS5##p##_##n##_OFFSET, 0x10000
static const struct exyo_locators exynos5_locators[] = {
- { "exywdt", OFFANDSIZE(,WDT), NOPORT, IRQ_WDT, 0 },
+ { "exyowdt", OFFANDSIZE(,WDT), NOPORT, IRQ_WDT, 0 },
{ "sscom", OFFANDSIZE(,UART0), 0, IRQ_UART0, 0 },
{ "sscom", OFFANDSIZE(,UART1), 1, IRQ_UART1, 0 },
{ "sscom", OFFANDSIZE(,UART2), 2, IRQ_UART2, 0 },
Index: src/sys/arch/arm/samsung/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.4 src/sys/arch/arm/samsung/files.exynos:1.5
--- src/sys/arch/arm/samsung/files.exynos:1.4 Tue Apr 29 16:47:10 2014
+++ src/sys/arch/arm/samsung/files.exynos Mon May 5 20:31:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.exynos,v 1.4 2014/04/29 16:47:10 reinoud Exp $
+# $NetBSD: files.exynos,v 1.5 2014/05/05 20:31:03 reinoud Exp $
#
# Configuration info for Samsung Exynos SoC ARM Peripherals
#
@@ -57,8 +57,8 @@ attach mct at exyo with exyo_mct
file arch/arm/samsung/mct.c exyo_mct
# Watchdog
-device exywdt : sysmon_wdog
-attach exywdt at exyo with exynos_wdt
+device exyowdt : sysmon_wdog
+attach exyowdt at exyo with exynos_wdt
file arch/arm/samsung/exynos_wdt.c exynos_wdt | exyo_io needs-flag
# UARTs
Index: src/sys/arch/evbarm/conf/ODROID
diff -u src/sys/arch/evbarm/conf/ODROID:1.1 src/sys/arch/evbarm/conf/ODROID:1.2
--- src/sys/arch/evbarm/conf/ODROID:1.1 Sun Apr 13 02:26:26 2014
+++ src/sys/arch/evbarm/conf/ODROID Mon May 5 20:31:03 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: ODROID,v 1.1 2014/04/13 02:26:26 matt Exp $
+# $NetBSD: ODROID,v 1.2 2014/05/05 20:31:03 reinoud Exp $
#
# ODROID -- ODROID series Exynos Kernel
#
@@ -202,7 +202,7 @@ endif
sscom2 at exyo0 port 2 # UART2
# Exynos Watchdog Timer
-#exywdt0 at exyo0 # watchdog
+#exyowdt0 at exyo0 # watchdog
# Odroid-U connectivity
Index: src/sys/arch/evbarm/conf/ODROID-U
diff -u src/sys/arch/evbarm/conf/ODROID-U:1.3 src/sys/arch/evbarm/conf/ODROID-U:1.4
--- src/sys/arch/evbarm/conf/ODROID-U:1.3 Tue Apr 29 16:47:10 2014
+++ src/sys/arch/evbarm/conf/ODROID-U Mon May 5 20:31:03 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: ODROID-U,v 1.3 2014/04/29 16:47:10 reinoud Exp $
+# $NetBSD: ODROID-U,v 1.4 2014/05/05 20:31:03 reinoud Exp $
#
# ODROID-U -- ODROID-U series Exynos Kernel
#
@@ -190,7 +190,7 @@ sscom0 at exyo0 port 0 # UART0
sscom1 at exyo0 port 1 # UART1
# Exynos Watchdog Timer
-exywdt0 at exyo0 flags 1 # watchdog
+exyowdt0 at exyo0 flags 1 # watchdog
# On-board USB
exyousb* at exyo0
