Module Name:    src
Committed By:   reinoud
Date:           Sat Apr 19 15:30:41 UTC 2014

Modified Files:
        src/sys/arch/arm/samsung: exynos_wdt.c
Removed Files:
        src/sys/arch/arm/samsung: exynos_wdt_reg.h

Log Message:
Move the WDT register definitions to the C source to unclutter the directory


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos_wdt.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/samsung/exynos_wdt_reg.h

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/exynos_wdt.c
diff -u src/sys/arch/arm/samsung/exynos_wdt.c:1.2 src/sys/arch/arm/samsung/exynos_wdt.c:1.3
--- src/sys/arch/arm/samsung/exynos_wdt.c:1.2	Fri Apr 18 14:32:49 2014
+++ src/sys/arch/arm/samsung/exynos_wdt.c	Sat Apr 19 15:30:41 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_wdt.c,v 1.2 2014/04/18 14:32:49 reinoud Exp $	*/
+/*	$NetBSD: exynos_wdt.c,v 1.3 2014/04/19 15:30:41 reinoud Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "exynos_wdt.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_wdt.c,v 1.2 2014/04/18 14:32:49 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_wdt.c,v 1.3 2014/04/19 15:30:41 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -46,7 +46,25 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_wdt.c
 
 #include <arm/samsung/exynos_reg.h>
 #include <arm/samsung/exynos_var.h>
-#include <arm/samsung/exynos_wdt_reg.h>
+
+
+/* Watchdog register definitions */
+#define EXYNOS_WDT_WTCON		0x0000
+#define  WTCON_PRESCALER		__BITS(15,8)
+#define  WTCON_ENABLE			__BIT(5)
+#define  WTCON_CLOCK_SELECT		__BITS(4,3)
+#define  WTCON_CLOCK_SELECT_16		__SHIFTIN(0, WTCON_CLOCK_SELECT)
+#define  WTCON_CLOCK_SELECT_32		__SHIFTIN(1, WTCON_CLOCK_SELECT)
+#define  WTCON_CLOCK_SELECT_64		__SHIFTIN(2, WTCON_CLOCK_SELECT)
+#define  WTCON_CLOCK_SELECT_128		__SHIFTIN(3, WTCON_CLOCK_SELECT)
+#define  WTCON_INT_ENABLE		__BIT(2)
+#define  WTCON_RESET_ENABLE		__BIT(0)
+#define EXYNOS_WDT_WTDAT		0x0004
+#define  WTDAT_RELOAD			__BITS(15,0)
+#define EXYNOS_WDT_WTCNT		0x0008
+#define  WTCNT_COUNT			__BITS(15,0)
+#define EXYNOS_WDT_WTCLRINT		0x000C
+
 
 #if NEXYNOS_WDT > 0
 static int exynos_wdt_match(device_t, cfdata_t, void *);

Reply via email to