[src/netbsd-8]: src/sys/arch/arm/omap Pull up following revision(s) (requeste...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/53b7af580137
branches:  netbsd-8
changeset: 434228:53b7af580137
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Aug 25 05:47:58 2017 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #228):
        sys/arch/arm/omap/am335x_prcm.c: revision 1.10
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

diffstat:

 sys/arch/arm/omap/am335x_prcm.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (37 lines):

diff -r 62f72877ca5f -r 53b7af580137 sys/arch/arm/omap/am335x_prcm.c
--- a/sys/arch/arm/omap/am335x_prcm.c   Fri Aug 25 05:46:46 2017 +0000
+++ b/sys/arch/arm/omap/am335x_prcm.c   Fri Aug 25 05:47:58 2017 +0000
@@ -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.9.8.1 2017/08/25 05:47:58 snj 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.9.8.1 2017/08/25 05:47:58 snj Exp $");
 
 #include "tps65217pmic.h"
 
@@ -61,18 +61,12 @@
 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