Module Name: src
Committed By: martin
Date: Sun Sep 22 12:25:26 UTC 2019
Modified Files:
src/sys/arch/arm/amlogic [netbsd-9]: meson8b_clkc.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/sys/arch/arm/amlogic/meson8b_clkc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/amlogic/meson8b_clkc.c
diff -u src/sys/arch/arm/amlogic/meson8b_clkc.c:1.3.6.1 src/sys/arch/arm/amlogic/meson8b_clkc.c:1.3.6.2
--- src/sys/arch/arm/amlogic/meson8b_clkc.c:1.3.6.1 Thu Aug 15 09:49:49 2019
+++ src/sys/arch/arm/amlogic/meson8b_clkc.c Sun Sep 22 12:25:25 2019
@@ -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 <[email protected]>
@@ -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 @@ static struct meson_clk_clk meson8b_clkc
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),
