Module Name: src
Committed By: kiyohara
Date: Mon Aug 30 05:37:30 UTC 2010
Modified Files:
src/sys/arch/evbarm/conf: OVERO
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
Log Message:
Support p...@obio1.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/OVERO
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
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/evbarm/conf/OVERO
diff -u src/sys/arch/evbarm/conf/OVERO:1.5 src/sys/arch/evbarm/conf/OVERO:1.6
--- src/sys/arch/evbarm/conf/OVERO:1.5 Sat Aug 28 04:58:49 2010
+++ src/sys/arch/evbarm/conf/OVERO Mon Aug 30 05:37:30 2010
@@ -1,5 +1,5 @@
#
-# $NetBSD: OVERO,v 1.5 2010/08/28 04:58:49 kiyohara Exp $
+# $NetBSD: OVERO,v 1.6 2010/08/30 05:37:30 kiyohara Exp $
#
# OVERO -- Gumstix. Inc. Overo platforms kernel
#
@@ -208,6 +208,9 @@
#omapwdt32k* at obio1 addr 0x4830c000 size 0x0800 # WDT1
omapwdt32k* at obio1 addr 0x48314000 size 0x0800 # WDT2
+# Power, Reset and Clock Management
+prcm* at obio1 addr 0x48306000 size 0x2000 # PRM Module
+
# On-board USB
#ehci* at obio0 addr 0x48064800 size 0x0400 intr 77
#ohci* at obio0 addr 0x48064400 size 0x0400 intr 76
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.31 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.32
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.31 Sat Aug 28 07:13:47 2010
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Mon Aug 30 05:37:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.31 2010/08/28 07:13:47 kiyohara Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.32 2010/08/30 05:37:30 kiyohara Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -142,6 +142,7 @@
#include "opt_gumstix.h"
#ifdef OVERO
#include "opt_omap.h"
+#include "prcm.h"
#endif
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -172,6 +173,9 @@
#include <arm/arm32/machdep.h>
#include <arm/omap/omap2_gpmcreg.h>
+#if NPRCM > 0
+#include <arm/omap/omap2_prcm.h>
+#endif
#include <arm/omap/omap2_reg.h>
#include <arm/omap/omap_var.h>
#include <arm/omap/omap_com.h>
@@ -330,6 +334,9 @@
printf("Please press any key to reboot.\n\n");
cngetc();
printf("rebooting...\n");
+#if defined(OMAP_3530) && NPRCM > 0
+ prcm_cold_reset();
+#endif
cpu_reset();
/*NOTREACHED*/
}
@@ -366,6 +373,9 @@
}
printf("rebooting...\n");
+#if defined(OMAP_3530) && NPRCM > 0
+ prcm_cold_reset();
+#endif
cpu_reset();
/*NOTREACHED*/
}
