git: 60190341b7a1 - main - aw_ccu: h6: Fix the id of PLL_DE and the names of the R_APB2 gates
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 12 Nov 2026 09:51:48 UTC
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=60190341b7a1f66244fc526554e84981a2d8ff0d
commit 60190341b7a1f66244fc526554e84981a2d8ff0d
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2026-11-10 14:18:40 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2026-11-12 09:47:32 +0000
aw_ccu: h6: Fix the id of PLL_DE and the names of the R_APB2 gates
CLK_PLL_DE had the same id as CLK_PLL_VE, 14, so two clocks of the CCU
shared an id. Use 15 as the Linux driver does.
The gates of the R_APB2 UART and I2C were named r_apb1-uart and
r_apb1-i2c, but their parent is r_apb2. Name them after it.
Tested on: H6
---
sys/dev/clk/allwinner/ccu_h6.c | 2 +-
sys/dev/clk/allwinner/ccu_h6_r.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/dev/clk/allwinner/ccu_h6.c b/sys/dev/clk/allwinner/ccu_h6.c
index 9d72d4331cb8..65f233531185 100644
--- a/sys/dev/clk/allwinner/ccu_h6.c
+++ b/sys/dev/clk/allwinner/ccu_h6.c
@@ -62,7 +62,7 @@
#define CLK_PLL_VIDEO1 12
#define CLK_PLL_VIDEO1_4X 13
#define CLK_PLL_VE 14
-#define CLK_PLL_DE 14
+#define CLK_PLL_DE 15
#define CLK_PLL_HSIC 16
#define CLK_AXI 22
diff --git a/sys/dev/clk/allwinner/ccu_h6_r.c b/sys/dev/clk/allwinner/ccu_h6_r.c
index 6d473d67301e..6fdc11325330 100644
--- a/sys/dev/clk/allwinner/ccu_h6_r.c
+++ b/sys/dev/clk/allwinner/ccu_h6_r.c
@@ -66,8 +66,8 @@ static struct aw_ccung_gate ccu_sun50i_h6_r_gates[] = {
CCU_GATE(CLK_R_APB1_TIMER, "r_apb1-timer", "r_apb1", 0x11c, 0)
CCU_GATE(CLK_R_APB1_TWD, "r_apb1-twd", "r_apb1", 0x12c, 0)
CCU_GATE(CLK_R_APB1_PWM, "r_apb1-pwm", "r_apb1", 0x13c, 0)
- CCU_GATE(CLK_R_APB2_UART, "r_apb1-uart", "r_apb2", 0x18c, 0)
- CCU_GATE(CLK_R_APB2_I2C, "r_apb1-i2c", "r_apb2", 0x19c, 0)
+ CCU_GATE(CLK_R_APB2_UART, "r_apb2-uart", "r_apb2", 0x18c, 0)
+ CCU_GATE(CLK_R_APB2_I2C, "r_apb2-i2c", "r_apb2", 0x19c, 0)
CCU_GATE(CLK_R_APB2_RSB, "r_apb2-rsb", "r_apb2", 0x1bc, 0)
CCU_GATE(CLK_R_APB1_IR, "r_apb1-ir", "r_apb1", 0x1cc, 0)
CCU_GATE(CLK_R_APB1_W1, "r_apb1-w1", "r_apb1", 0x1ec, 0)