Sat Jan 30 09:36:46 2021 UTC ()
Pretty print


(skrll)
diff -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_clk.c
cvs diff -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_clk.c (expand / switch to unified diff)

--- src/sys/arch/arm/nxp/imx6_clk.c 2021/01/27 03:10:20 1.2
+++ src/sys/arch/arm/nxp/imx6_clk.c 2021/01/30 09:36:46 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: imx6_clk.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $ */ 1/* $NetBSD: imx6_clk.c,v 1.3 2021/01/30 09:36:46 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2019 Genetec Corporation. All rights reserved. 4 * Copyright (c) 2019 Genetec Corporation. All rights reserved.
5 * Written by Hashimoto Kenichi for Genetec Corporation. 5 * Written by Hashimoto Kenichi for Genetec Corporation.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,27 +17,27 @@ @@ -17,27 +17,27 @@
17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 17 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 18 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 19 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 20 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 23 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: imx6_clk.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: imx6_clk.c,v 1.3 2021/01/30 09:36:46 skrll Exp $");
31 31
32#include "opt_fdt.h" 32#include "opt_fdt.h"
33 33
34#include <sys/types.h> 34#include <sys/types.h>
35#include <sys/time.h> 35#include <sys/time.h>
36#include <sys/bus.h> 36#include <sys/bus.h>
37#include <sys/device.h> 37#include <sys/device.h>
38#include <sys/sysctl.h> 38#include <sys/sysctl.h>
39#include <sys/cpufreq.h> 39#include <sys/cpufreq.h>
40#include <sys/malloc.h> 40#include <sys/malloc.h>
41#include <sys/kmem.h> 41#include <sys/kmem.h>
42#include <sys/param.h> 42#include <sys/param.h>
43 43
@@ -123,28 +123,28 @@ imx6ccm_attach(device_t parent, device_t @@ -123,28 +123,28 @@ imx6ccm_attach(device_t parent, device_t
123 if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh)) { 123 if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh)) {
124 aprint_error(": can't map ccm registers\n"); 124 aprint_error(": can't map ccm registers\n");
125 return; 125 return;
126 } 126 }
127 127
128 int phandle = OF_finddevice("/soc/aips-bus/anatop"); 128 int phandle = OF_finddevice("/soc/aips-bus/anatop");
129 fdtbus_get_reg(phandle, 0, &addr, &size); 129 fdtbus_get_reg(phandle, 0, &addr, &size);
130 130
131 if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh_analog)) { 131 if (bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh_analog)) {
132 aprint_error(": can't map anatop registers\n"); 132 aprint_error(": can't map anatop registers\n");
133 return; 133 return;
134 } 134 }
135 135
136 imx6ccm_attach_common(self); 
137 
138 aprint_naive("\n"); 136 aprint_naive("\n");
139 aprint_normal(": Clock Control Module\n"); 137 aprint_normal(": Clock Control Module\n");
140 138
 139 imx6ccm_attach_common(self);
 140
141 imx6_clk_fixed_from_fdt("ckil"); 141 imx6_clk_fixed_from_fdt("ckil");
142 imx6_clk_fixed_from_fdt("ckih"); 142 imx6_clk_fixed_from_fdt("ckih");
143 imx6_clk_fixed_from_fdt("osc"); 143 imx6_clk_fixed_from_fdt("osc");
144 imx6_clk_fixed_from_fdt("anaclk1"); 144 imx6_clk_fixed_from_fdt("anaclk1");
145 imx6_clk_fixed_from_fdt("anaclk2"); 145 imx6_clk_fixed_from_fdt("anaclk2");
146 146
147 fdtbus_register_clock_controller(self, faa->faa_phandle, 147 fdtbus_register_clock_controller(self, faa->faa_phandle,
148 &imx6_ccm_fdtclock_funcs); 148 &imx6_ccm_fdtclock_funcs);
149} 149}
150 150