[src/netbsd-9]: src/sys/arch/arm/ti Pull up following revision(s) (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/d185856c032b
branches:  netbsd-9
changeset: 963928:d185856c032b
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jun 07 13:28:02 2020 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #944):

        sys/arch/arm/ti/ti_dpll_clock.c: revision 1.3

Fix dpll clock setting on am335x

diffstat:

 sys/arch/arm/ti/ti_dpll_clock.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 2776d4a99a60 -r d185856c032b sys/arch/arm/ti/ti_dpll_clock.c
--- a/sys/arch/arm/ti/ti_dpll_clock.c   Sun Jun 07 13:20:01 2020 +0000
+++ b/sys/arch/arm/ti/ti_dpll_clock.c   Sun Jun 07 13:28:02 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_dpll_clock.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $ */
+/* $NetBSD: ti_dpll_clock.c,v 1.2.2.3 2020/06/07 13:28:02 martin Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_dpll_clock.c,v 1.2.2.2 2019/11/27 13:46:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_dpll_clock.c,v 1.2.2.3 2020/06/07 13:28:02 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -267,7 +267,7 @@
        control |= __SHIFTIN(AM3_DPLL_EN_NM_BYPASS, AM3_DPLL_EN);
        WR4(sc, REG_CONTROL, control);
 
-       while ((RD4(sc, REG_IDLEST) & AM3_ST_MN_BYPASS) != 0)
+       while (RD4(sc, REG_IDLEST) != AM3_ST_MN_BYPASS)
                ;
 
        mult_div1 = __SHIFTIN(mult, DPLL_MULT);
@@ -278,7 +278,7 @@
        control |= __SHIFTIN(AM3_DPLL_EN_LOCK, AM3_DPLL_EN);
        WR4(sc, REG_CONTROL, control);
 
-       while ((RD4(sc, REG_IDLEST) & AM3_ST_DPLL_CLK) != 0)
+       while (RD4(sc, REG_IDLEST) != AM3_ST_DPLL_CLK)
                ;    
 
        return 0;