[src/trunk]: src/sys/arch/arm/allwinner Make sure AWIN_PLL_CFG_BYPASS is clea...

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

details:   https://anonhg.NetBSD.org/src/rev/1c1283b1769c
branches:  trunk
changeset: 789829:1c1283b1769c
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Sep 09 17:53:36 2013 +0000

description:
Make sure AWIN_PLL_CFG_BYPASS is cleared (it was but just being safe.)

diffstat:

 sys/arch/arm/allwinner/awin_board.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r 742b1c1ee4de -r 1c1283b1769c sys/arch/arm/allwinner/awin_board.c
--- a/sys/arch/arm/allwinner/awin_board.c       Mon Sep 09 17:52:48 2013 +0000
+++ b/sys/arch/arm/allwinner/awin_board.c       Mon Sep 09 17:53:36 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awin_board.c,v 1.5 2013/09/08 10:32:56 jmcneill Exp $  */
+/*     $NetBSD: awin_board.c,v 1.6 2013/09/09 17:53:36 matt Exp $      */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.5 2013/09/08 10:32:56 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.6 2013/09/09 17:53:36 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -205,6 +205,7 @@
         */
        uint32_t ncfg = ocfg;
        ncfg &= ~(AWIN_PLL_CFG_FACTOR_M|AWIN_PLL_CFG_FACTOR_N);
+       ncfg &= ~(AWIN_PLL_CFG_BYPASS);
        ncfg |= __SHIFTIN(k, AWIN_PLL_CFG_FACTOR_M);
        ncfg |= __SHIFTIN(25, AWIN_PLL_CFG_FACTOR_N);
        ncfg |= AWIN_PLL_CFG_ENABLE | AWIN_PLL6_CFG_SATA_CLK_EN;
@@ -212,4 +213,11 @@
                bus_space_write_4(bst, bsh,
                    AWIN_CCM_OFFSET + AWIN_PLL6_CFG_REG, ncfg);
        }
+#if 0
+       printf(" [pll6=%#x->%#x:n=%ju k=%ju m=%ju] ",
+           ocfg, ncfg,
+           __SHIFTOUT(ncfg, AWIN_PLL_CFG_FACTOR_N),
+           __SHIFTOUT(ncfg, AWIN_PLL_CFG_FACTOR_K),
+           __SHIFTOUT(ncfg, AWIN_PLL_CFG_FACTOR_M));
+#endif
 }