[src/trunk]: src/sys/arch/arm/allwinner awin_cpu_clk(): Fix reading of CPU_CL...

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

details:   https://anonhg.NetBSD.org/src/rev/d3f859862da5
branches:  trunk
changeset: 341062:d3f859862da5
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Oct 17 14:46:01 2015 +0000

description:
awin_cpu_clk(): Fix reading of CPU_CLK_SRC_CEL bits: doing a shiftin followed
by a shiftout ends up reading bits(0,1) instead of AWIN_CPU_CLK_SRC_SEL.
It happens that these bits (AWIN_AXI_CLK_DIV_RATIO) are 2 (divide by 3) at boot
(at last on cubieboard2 and olimex lime2), which matches
AWIN_CPU_CLK_SRC_SEL_PLL1, so this has gone  unnoticed.

diffstat:

 sys/arch/arm/allwinner/awin_board.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r b5a8f5744554 -r d3f859862da5 sys/arch/arm/allwinner/awin_board.c
--- a/sys/arch/arm/allwinner/awin_board.c       Sat Oct 17 13:53:40 2015 +0000
+++ b/sys/arch/arm/allwinner/awin_board.c       Sat Oct 17 14:46:01 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: awin_board.c,v 1.35 2015/04/20 01:33:22 matt Exp $     */
+/*     $NetBSD: awin_board.c,v 1.36 2015/10/17 14:46:01 bouyer Exp $   */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.35 2015/04/20 01:33:22 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.36 2015/10/17 14:46:01 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -143,8 +143,7 @@
                                      AWIN_CPU_AHB_APB0_CFG_REG;
        const uint32_t cpu0_cfg = bus_space_read_4(bst, awin_core_bsh,
            AWIN_CCM_OFFSET + reg);
-       const u_int cpu_clk_sel = __SHIFTIN(cpu0_cfg, AWIN_CPU_CLK_SRC_SEL);
-       switch (__SHIFTOUT(cpu_clk_sel, AWIN_CPU_CLK_SRC_SEL)) {
+       switch (__SHIFTOUT(cpu0_cfg, AWIN_CPU_CLK_SRC_SEL)) {
        case AWIN_CPU_CLK_SRC_SEL_LOSC:
                ci->ci_data.cpu_cc_freq = 32768;
                break;