Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/imx Spell GENERIC correctly. NFCI.



details:   https://anonhg.NetBSD.org/src/rev/5ac812d08836
branches:  trunk
changeset: 973094:5ac812d08836
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Jun 19 16:11:14 2020 +0000

description:
Spell GENERIC correctly.  NFCI.

diffstat:

 sys/arch/arm/imx/imx6_ccm.c    |  10 +++++-----
 sys/arch/arm/imx/imx6_ccmvar.h |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 6de5ba59f350 -r 5ac812d08836 sys/arch/arm/imx/imx6_ccm.c
--- a/sys/arch/arm/imx/imx6_ccm.c       Fri Jun 19 16:08:06 2020 +0000
+++ b/sys/arch/arm/imx/imx6_ccm.c       Fri Jun 19 16:11:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_ccm.c,v 1.18 2020/06/08 07:48:57 hkenken Exp $    */
+/*     $NetBSD: imx6_ccm.c,v 1.19 2020/06/19 16:11:14 skrll Exp $      */
 
 /*
  * Copyright (c) 2010-2012, 2014  Genetec Corporation.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.18 2020/06/08 07:48:57 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.19 2020/06/19 16:11:14 skrll Exp $");
 
 #include "opt_cputypes.h"
 
@@ -661,7 +661,7 @@
        CLK_PFD("pll3_pfd3_454m", "pll3_usb_otg", PFD_480, 3),
 
        CLK_PLL("pll1", "osc", SYS, PLL_ARM, DIV_SELECT, POWERDOWN, 0),
-       CLK_PLL("pll2", "osc", GENNERIC, PLL_SYS, DIV_SELECT, POWERDOWN, 0),
+       CLK_PLL("pll2", "osc", GENERIC, PLL_SYS, DIV_SELECT, POWERDOWN, 0),
        CLK_PLL("pll3", "osc", USB, PLL_USB1, DIV_SELECT, POWER, 0),
        CLK_PLL("pll4", "osc", AUDIO_VIDEO, PLL_AUDIO, DIV_SELECT, POWERDOWN, 0),
        CLK_PLL("pll5", "osc", AUDIO_VIDEO, PLL_VIDEO, DIV_SELECT, POWERDOWN, 0),
@@ -1035,7 +1035,7 @@
        struct imx6_clk_pll *pll = &iclk->clk.pll;
        uint64_t freq = rate_parent;
 
-       KASSERT((pll->type == IMX6_CLK_PLL_GENNERIC) ||
+       KASSERT((pll->type == IMX6_CLK_PLL_GENERIC) ||
            (pll->type == IMX6_CLK_PLL_USB));
 
        uint32_t v = bus_space_read_4(sc->sc_iot, sc->sc_ioh_analog, pll->reg);
@@ -1124,7 +1124,7 @@
        uint64_t rate_parent = imxccm_clk_get_rate(sc, &parent->base);
 
        switch(pll->type) {
-       case IMX6_CLK_PLL_GENNERIC:
+       case IMX6_CLK_PLL_GENERIC:
                return imxccm_clk_get_rate_pll_generic(sc, iclk, rate_parent);
        case IMX6_CLK_PLL_SYS:
                return imxccm_clk_get_rate_pll_sys(sc, iclk, rate_parent);
diff -r 6de5ba59f350 -r 5ac812d08836 sys/arch/arm/imx/imx6_ccmvar.h
--- a/sys/arch/arm/imx/imx6_ccmvar.h    Fri Jun 19 16:08:06 2020 +0000
+++ b/sys/arch/arm/imx/imx6_ccmvar.h    Fri Jun 19 16:11:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: imx6_ccmvar.h,v 1.7 2019/07/24 11:58:00 hkenken Exp $  */
+/*     $NetBSD: imx6_ccmvar.h,v 1.8 2020/06/19 16:11:14 skrll Exp $    */
 /*
  * Copyright (c) 2012,2019  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -326,7 +326,7 @@
 };
 
 enum imx6_clk_pll_type {
-       IMX6_CLK_PLL_GENNERIC,
+       IMX6_CLK_PLL_GENERIC,
        IMX6_CLK_PLL_SYS,
        IMX6_CLK_PLL_USB,
        IMX6_CLK_PLL_AUDIO_VIDEO,



Home | Main Index | Thread Index | Old Index