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

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

details:   https://anonhg.NetBSD.org/src/rev/b6b7e8190b29
branches:  netbsd-9
changeset: 454588:b6b7e8190b29
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 22 12:25:25 2019 +0000

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

        sys/arch/arm/amlogic/meson8b_clkc.c: revision 1.5

Use correct register for mpll2_div clock

diffstat:

 sys/arch/arm/amlogic/meson8b_clkc.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 98f9ec23a9b9 -r b6b7e8190b29 sys/arch/arm/amlogic/meson8b_clkc.c
--- a/sys/arch/arm/amlogic/meson8b_clkc.c       Sun Sep 22 12:22:23 2019 +0000
+++ b/sys/arch/arm/amlogic/meson8b_clkc.c       Sun Sep 22 12:25:25 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b_clkc.c,v 1.3.6.1 2019/08/15 09:49:49 martin Exp $ */
+/* $NetBSD: meson8b_clkc.c,v 1.3.6.2 2019/09/22 12:25:25 martin Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: meson8b_clkc.c,v 1.3.6.1 2019/08/15 09:49:49 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: meson8b_clkc.c,v 1.3.6.2 2019/09/22 12:25:25 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -268,9 +268,9 @@
            MESON_CLK_PLL_REG_INVALID,                          /* ssen */
            0),
        MESON_CLK_MPLL(MESON8B_CLOCK_MPLL2_DIV, "mpll2_div", "mpll_prediv",
-           MESON_CLK_PLL_REG(HHI_MPLL_CNTL8, __BITS(13,0)),    /* sdm */
-           MESON_CLK_PLL_REG(HHI_MPLL_CNTL8, __BIT(15)),       /* sdm_enable */
-           MESON_CLK_PLL_REG(HHI_MPLL_CNTL8, __BITS(24,16)),   /* n2 */
+           MESON_CLK_PLL_REG(HHI_MPLL_CNTL9, __BITS(13,0)),    /* sdm */
+           MESON_CLK_PLL_REG(HHI_MPLL_CNTL9, __BIT(15)),       /* sdm_enable */
+           MESON_CLK_PLL_REG(HHI_MPLL_CNTL9, __BITS(24,16)),   /* n2 */
            MESON_CLK_PLL_REG_INVALID,                          /* ssen */
            0),