From nobody Thu Nov 12 09:51:48 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jQFz84R1Xz70KTL for ; Thu, 12 Nov 2026 09:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQFz82BMWz3GRZ for ; Thu, 12 Nov 2026 09:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdJGiTjqUKleD4mgHYKLwyXNL9zpSzhTz57q+a/u9r4=; b=mS4YcgwwVhH84rVxYIv0MiIGKWrc/e/Oxu6Q7A+XfOUWmlBW4WGrSqH/DTc2D5wA/b5qb2 /M6HvKDAnfjwpq1R9KoygRWe7YaoSTN4kHEO/RhZxw/1fjgXkKkEvVijYfqXCl5T6Cn7aK n24llw8E27vFEaHgmlZQihyLXNX3+5XItf2ezoYO7Qfz4SEDYNNf+d/UvMmEst+lRSbOT+ TwQqUGpeubIoQSjN96nnfo28y2XBxRJFNtzMC1+NaO7f6iBNvpd3i0cYwa7DH2SButSEx3 dgnnkfQ9mGW+vrruBOIBx0xlFGu43PTU6IZuC0nby/rM9D9uN54hECSD4U3WgA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794477108; b=QTQRTUOYMCiolRlMJXCzLb2XIVjsLjFSBaIwQu7Uzco1Qo3Vzq1ZgysHhJtK0ts9imeZfO weSvx0kKtjra5djXJgxG0872O0Ad+i2Goy9/RZvAwEOrE7cz0jXHdPiEabBYi9QiYn/F40 MHZx/eSQl9TyyxUgqgvKbs5UAP/Y8YoC+CuKwAfdVZGUCkBDfi4lDWmijWhhlB8oOkpo66 JcQz+Kad601Y5ZbOKpXdwHdtNlGcjxotG+zDbfKoZqvy9hAii08tZTyZ4CfvcGnm63mPnw ly60jjTQVvrtZWxA3hWW7K4jaKvummlM8JE+oK8KMegGZtoiPXiz/m9FkYD/Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794477108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdJGiTjqUKleD4mgHYKLwyXNL9zpSzhTz57q+a/u9r4=; b=qZj4rXAqzJZHoNsp/Hitf0BaoJybMt1i/MdN9t0mqB9WtSQUVWiggrQWbx2FklH4Prynu+ tXJrXupoS26iREmv4cw2Mxx0js5sRgTn9epEzcvgCke4CPSwoYIV6Ou8bGsOPNQH8nQwNI PvMCGl7SYDgHeIar5oO7mzYu6lW3b5ogTLa9RyF10bcvwfEwsJDqGWDF1gkipHVXS16853 ybEW9W2D+TnyGDHgupu3LuxbGgmpDpJFJ7AONkNyByvPx9mbdNLDIbwC5rtlUF9oTEWEsy eGmpJXrEV12iFnpnwu0p4KAI8sjXu05EeOxFpGysTxyk7haBPt0CMTraL+UgyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQFz81r2dzy0X for ; Thu, 12 Nov 2026 09:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e8f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 09:51:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 60190341b7a1 - main - aw_ccu: h6: Fix the id of PLL_DE and the names of the R_APB2 gates List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60190341b7a1f66244fc526554e84981a2d8ff0d Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 09:51:48 +0000 Message-Id: <6af58c34.1e8f1.6229428a@gitrepo.freebsd.org> The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=60190341b7a1f66244fc526554e84981a2d8ff0d commit 60190341b7a1f66244fc526554e84981a2d8ff0d Author: Emmanuel Vadot AuthorDate: 2026-11-10 14:18:40 +0000 Commit: Emmanuel Vadot 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)