Module Name: src
Committed By: skrll
Date: Fri Jun 19 16:11:15 UTC 2020
Modified Files:
src/sys/arch/arm/imx: imx6_ccm.c imx6_ccmvar.h
Log Message:
Spell GENERIC correctly. NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/imx/imx6_ccm.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/imx/imx6_ccmvar.h
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/imx/imx6_ccm.c
diff -u src/sys/arch/arm/imx/imx6_ccm.c:1.18 src/sys/arch/arm/imx/imx6_ccm.c:1.19
--- src/sys/arch/arm/imx/imx6_ccm.c:1.18 Mon Jun 8 07:48:57 2020
+++ src/sys/arch/arm/imx/imx6_ccm.c Fri Jun 19 16:11:14 2020
@@ -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 @@ static struct imx6_clk imx6_clks[] = {
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 @@ imxccm_clk_get_rate_pll_generic(struct i
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 @@ imxccm_clk_get_rate_pll(struct imxccm_so
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);
Index: src/sys/arch/arm/imx/imx6_ccmvar.h
diff -u src/sys/arch/arm/imx/imx6_ccmvar.h:1.7 src/sys/arch/arm/imx/imx6_ccmvar.h:1.8
--- src/sys/arch/arm/imx/imx6_ccmvar.h:1.7 Wed Jul 24 11:58:00 2019
+++ src/sys/arch/arm/imx/imx6_ccmvar.h Fri Jun 19 16:11:14 2020
@@ -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_reg {
};
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,
