Module Name: src
Committed By: skrll
Date: Wed Aug 23 14:14:59 UTC 2017
Modified Files:
src/sys/arch/arm/omap: am335x_prcm.c
Log Message:
Always perform code previously code under #ifdef DIAGNOSTIC - it appears
that the read is needed to help make the chip work. Someone with time and
a datasheet can hopefully work out why.
Fixes John D. Baker's boot problem reported on port-arm here:
http://mail-index.netbsd.org/port-arm/2017/07/27/msg004323.html
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/am335x_prcm.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/arm/omap/am335x_prcm.c
diff -u src/sys/arch/arm/omap/am335x_prcm.c:1.9 src/sys/arch/arm/omap/am335x_prcm.c:1.10
--- src/sys/arch/arm/omap/am335x_prcm.c:1.9 Tue Oct 18 15:10:35 2016
+++ src/sys/arch/arm/omap/am335x_prcm.c Wed Aug 23 14:14:59 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: am335x_prcm.c,v 1.9 2016/10/18 15:10:35 kiyohara Exp $ */
+/* $NetBSD: am335x_prcm.c,v 1.10 2017/08/23 14:14:59 skrll Exp $ */
/*
* TI OMAP Power, Reset, and Clock Management on the AM335x
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am335x_prcm.c,v 1.9 2016/10/18 15:10:35 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am335x_prcm.c,v 1.10 2017/08/23 14:14:59 skrll Exp $");
#include "tps65217pmic.h"
@@ -61,18 +61,12 @@ static void
am335x_prcm_check_clkctrl(bus_size_t cm_module,
bus_size_t clkctrl_reg, uint32_t v)
{
-#ifdef DIAGNOSTIC
uint32_t u = prcm_read_4(cm_module, clkctrl_reg);
if (__SHIFTOUT(u, AM335X_CLKCTRL_MODULEMODE_MASK) !=
__SHIFTOUT(v, AM335X_CLKCTRL_MODULEMODE_MASK))
aprint_error("clkctrl didn't take: %"PRIx32" -/-> %"PRIx32"\n",
u, v);
-#else
- (void)cm_module;
- (void)clkctrl_reg;
- (void)v;
-#endif
}
void
