Module Name: src Committed By: skrll Date: Sun Sep 1 07:55:27 UTC 2024
Modified Files: src/sys/arch/arm/nxp: imx6_ccm.c imx6_clk.c imx6sx_clk.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nxp/imx6_ccm.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nxp/imx6_clk.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6sx_clk.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/nxp/imx6_ccm.c diff -u src/sys/arch/arm/nxp/imx6_ccm.c:1.4 src/sys/arch/arm/nxp/imx6_ccm.c:1.5 --- src/sys/arch/arm/nxp/imx6_ccm.c:1.4 Thu May 4 13:25:07 2023 +++ src/sys/arch/arm/nxp/imx6_ccm.c Sun Sep 1 07:55:27 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_ccm.c,v 1.4 2023/05/04 13:25:07 bouyer Exp $ */ +/* $NetBSD: imx6_ccm.c,v 1.5 2024/09/01 07:55:27 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.4 2023/05/04 13:25:07 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.5 2024/09/01 07:55:27 skrll Exp $"); #include "opt_imx.h" #include "opt_cputypes.h" @@ -75,7 +75,7 @@ static const struct clk_funcs imxccm_clk }; void -imx6ccm_attach_common(device_t self, struct imx6_clk *imx6_clks, int size, +imx6ccm_attach_common(device_t self, struct imx6_clk *imx6_clks, int size, struct imxccm_init_parent *imxccm_init_parents) { struct imx6ccm_softc * const sc = device_private(self); Index: src/sys/arch/arm/nxp/imx6_clk.c diff -u src/sys/arch/arm/nxp/imx6_clk.c:1.6 src/sys/arch/arm/nxp/imx6_clk.c:1.7 --- src/sys/arch/arm/nxp/imx6_clk.c:1.6 Thu May 4 13:25:07 2023 +++ src/sys/arch/arm/nxp/imx6_clk.c Sun Sep 1 07:55:27 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_clk.c,v 1.6 2023/05/04 13:25:07 bouyer Exp $ */ +/* $NetBSD: imx6_clk.c,v 1.7 2024/09/01 07:55:27 skrll Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx6_clk.c,v 1.6 2023/05/04 13:25:07 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_clk.c,v 1.7 2024/09/01 07:55:27 skrll Exp $"); #include "opt_fdt.h" @@ -1275,8 +1275,8 @@ imx6qccm_attach(device_t parent, device_ aprint_error(": can't get anatop registers\n"); return; } - - + + if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh_analog)) { aprint_error(": can't map anatop registers\n"); return; @@ -1285,7 +1285,7 @@ imx6qccm_attach(device_t parent, device_ aprint_naive("\n"); aprint_normal(": Clock Control Module\n"); - imx6ccm_attach_common(self, &imx6q_clks[0], __arraycount(imx6q_clks), + imx6ccm_attach_common(self, &imx6q_clks[0], __arraycount(imx6q_clks), imxccm6q_init_parents); imx6q_clk_fixed_from_fdt(sc, "ckil"); Index: src/sys/arch/arm/nxp/imx6sx_clk.c diff -u src/sys/arch/arm/nxp/imx6sx_clk.c:1.3 src/sys/arch/arm/nxp/imx6sx_clk.c:1.4 --- src/sys/arch/arm/nxp/imx6sx_clk.c:1.3 Fri May 5 09:34:09 2023 +++ src/sys/arch/arm/nxp/imx6sx_clk.c Sun Sep 1 07:55:27 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6sx_clk.c,v 1.3 2023/05/05 09:34:09 bouyer Exp $ */ +/* $NetBSD: imx6sx_clk.c,v 1.4 2024/09/01 07:55:27 skrll Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx6sx_clk.c,v 1.3 2023/05/05 09:34:09 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6sx_clk.c,v 1.4 2024/09/01 07:55:27 skrll Exp $"); #include "opt_fdt.h" @@ -977,8 +977,8 @@ static struct imx6_clk imx6sx_clks[] = { CLK_FIXED("dummy", 0), CLK_FIXED("ckil", IMX6_CKIL_FREQ), CLK_FIXED("osc", IMX6_OSC_FREQ), - CLK_FIXED("ipp_di0", IMX6_OSC_FREQ), - CLK_FIXED("ipp_di1", IMX6_OSC_FREQ), + CLK_FIXED("ipp_di0", IMX6_OSC_FREQ), + CLK_FIXED("ipp_di1", IMX6_OSC_FREQ), CLK_FIXED("anaclk1", IMX6_ANACLK1_FREQ), CLK_FIXED("anaclk2", IMX6_ANACLK2_FREQ), @@ -1388,8 +1388,8 @@ imx6sxccm_attach(device_t parent, device aprint_error(": can't get anatop registers\n"); return; } - - + + if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh_analog)) { aprint_error(": can't map anatop registers\n"); return;