Module Name: src
Committed By: skrll
Date: Sun Sep 1 08:08:24 UTC 2024
Modified Files:
src/sys/arch/arm/nxp: imx6_clk.c
Log Message:
Catch up with latest DTS and other fixes from Rui-Xiang Guo on port-arm.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_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_clk.c
diff -u src/sys/arch/arm/nxp/imx6_clk.c:1.7 src/sys/arch/arm/nxp/imx6_clk.c:1.8
--- src/sys/arch/arm/nxp/imx6_clk.c:1.7 Sun Sep 1 07:55:27 2024
+++ src/sys/arch/arm/nxp/imx6_clk.c Sun Sep 1 08:08:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_clk.c,v 1.7 2024/09/01 07:55:27 skrll Exp $ */
+/* $NetBSD: imx6_clk.c,v 1.8 2024/09/01 08:08:24 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.7 2024/09/01 07:55:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_clk.c,v 1.8 2024/09/01 08:08:24 skrll Exp $");
#include "opt_fdt.h"
@@ -617,7 +617,7 @@ static struct imx_clock_id {
} imx6q_clock_ids[] = {
{ IMX6QCLK_DUMMY, "dummy" },
{ IMX6QCLK_CKIL, "ckil" },
- { IMX6QCLK_CKIH, "ckih" },
+ { IMX6QCLK_CKIH, "ckih1" },
{ IMX6QCLK_OSC, "osc" },
{ IMX6QCLK_PLL2_PFD0_352M, "pll2_pfd0_352m" },
{ IMX6QCLK_PLL2_PFD1_594M, "pll2_pfd1_594m" },
@@ -888,7 +888,7 @@ static struct imx6_clk imx6q_clks[] = {
CLK_FIXED("dummy", 0),
CLK_FIXED("ckil", IMX6_CKIL_FREQ),
- CLK_FIXED("ckih", IMX6_CKIH_FREQ),
+ CLK_FIXED("ckih1", IMX6_CKIH_FREQ),
CLK_FIXED("osc", IMX6_OSC_FREQ),
CLK_FIXED("anaclk1", IMX6_ANACLK1_FREQ),
CLK_FIXED("anaclk2", IMX6_ANACLK2_FREQ),
@@ -1264,7 +1264,7 @@ imx6qccm_attach(device_t parent, device_
return;
}
- int phandle = OF_finddevice("/soc/aips-bus/anatop");
+ int phandle = OF_finddevice("/soc/bus/anatop");
if (phandle == -1) {
aprint_error(": can't find anatop device\n");
@@ -1289,10 +1289,8 @@ imx6qccm_attach(device_t parent, device_
imxccm6q_init_parents);
imx6q_clk_fixed_from_fdt(sc, "ckil");
- imx6q_clk_fixed_from_fdt(sc, "ckih");
+ imx6q_clk_fixed_from_fdt(sc, "ckih1");
imx6q_clk_fixed_from_fdt(sc, "osc");
- imx6q_clk_fixed_from_fdt(sc, "anaclk1");
- imx6q_clk_fixed_from_fdt(sc, "anaclk2");
fdtbus_register_clock_controller(self, faa->faa_phandle,
&imx6q_ccm_fdtclock_funcs);
