From nobody Tue Apr 08 03:47:29 2025 X-Original-To: dev-commits-src-main@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 4ZWsTt1BGHz5sg1p; Tue, 08 Apr 2025 03:47:30 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWsTs6dL4z45gQ; Tue, 08 Apr 2025 03:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744084049; 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=bh36zhuhej1UxkMPSbBur/YxYJ3iHzKh6wKAMhpO2uc=; b=YPMue8n7zcNY6RUG6H412IXaAc/laYqpx9fstNbiUhjnoc7QNch6XleBfj30ymA1E8+Z6C s62sulIVbYfcxfZhqR5Ie7ukiC1iEAE7dM4W0Tlq7EFI9E6zsGfg0B9pB1hmMUlDD64bl/ j5uvPgOLshEN1fL7lLRqOxJ4tn7EVPmVtTC/IWvqY5Rz3zge9dBJhbp/la3P0im1BtZqOh FLTfSjv1bLsDd+S/fIvkGi5LqnDGp3cqfhOr1ZKG/mvpLddkFmDzUvZbfMO6jO037O8gbV yqLUdvauotR7N9c7A141kAa4n4zVjyJnw/rbVRHg6Mp8c2gK5IKYbqKPTNvyAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744084049; a=rsa-sha256; cv=none; b=Zs1YlG7yvzOlkx4LwG8+AKtF0LBS6dnlal6zna8mdCkn2cz39JPwbSP1Gjm4dOW3fv/8zT M8hcDq7ArV8cHkCgo9QWHtv+tKTjnUfo3anrpxZeneRYSv9pBZkfrPp6HIF64m1LspeD2I f0TCwVlHU4ZiO0E1PDcXMBveUN/wbZt02dTq1twA1E76MDl47nT2zEEDvgam0Kra16KsxH sSUOd8O+unX2K7zvwLqIx3zEHAcSiLSs3FfvLoEFOGXrNgB8tU/2hq9CBCTbsAu3mGv4q1 4VLn9Pnt14Uet8TsBI4NfJEcWTCtoXblV8r3+QsSNw9m8zFuUpSxtwZgitB3Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744084049; 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=bh36zhuhej1UxkMPSbBur/YxYJ3iHzKh6wKAMhpO2uc=; b=iVRoZnI1ncRvQ9Pw/HOhWORCSZ2kuM1wfa/3rIeG7uxrALYT3Gf0x0uwPbv4Mf+Kl30jik hLoDstTxh3rR+iapcb13AQuDCQJrH3hGrJusw6pcwbECC94lB+FYs49gOX8qXU6pWuBUIT M79lZZB+IDdiM0+Ecct27g8nAltSduuwzycxg5YmSAmLlt5m4Leh8f3NEUmGTimSQ9l17Z dEl5kMpxoUF7ZLSK4CHY3BYucY8IIVJFrm/EVOVm/2bZj9bbMb5z/Pjmj88hjOcKzYmTzQ lB1t1CbDr5hRn4QiB8tC1ZpHIwPoR9L9KnbPVKnjwqVd7ogRv1146Aju1H1w1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZWsTs5jWnzqy; Tue, 08 Apr 2025 03:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5383lTHO016712; Tue, 8 Apr 2025 03:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5383lT3D016709; Tue, 8 Apr 2025 03:47:29 GMT (envelope-from git) Date: Tue, 8 Apr 2025 03:47:29 GMT Message-Id: <202504080347.5383lT3D016709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7d2eef229f1e - main - qcom_gcc: migrate to use sleep_clk directly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d2eef229f1e77b1cd68b98c002e913234ffc350 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7d2eef229f1e77b1cd68b98c002e913234ffc350 commit 7d2eef229f1e77b1cd68b98c002e913234ffc350 Author: Adrian Chadd AuthorDate: 2025-04-05 20:33:28 +0000 Commit: Adrian Chadd CommitDate: 2025-04-08 03:46:02 +0000 qcom_gcc: migrate to use sleep_clk directly gcc_sleep_clk_src does not exist, just use sleep_clk directly. I believe this is what feeds them anyway! This node isn't in the Linux clock driver (drivers/clk/qcom) ipq401x clock tree, but there are sleep_clk_src nodes in the tree in ipq50xx, ipq54xx, ipq60xx, ipq8xxxx, ipq9xxxx, msm8xxx, etc. Differential Revision: https://reviews.freebsd.org/D49686 --- sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c index 3135c3cd685e..ce67b2898efb 100644 --- a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c +++ b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c @@ -578,7 +578,7 @@ static struct qcom_clk_branch2_def branch2_tbl[] = { 0x1e00c, 0, 0, 0, 0x1e00c, QCOM_CLK_BRANCH2_BRANCH_HALT, false, 0), F_BRANCH2(GCC_USB2_SLEEP_CLK, "gcc_usb2_sleep_clk", - "gcc_sleep_clk_src", 0x1e010, 0, 0, 0, 0x1e010, + "sleep_clk", 0x1e010, 0, 0, 0, 0x1e010, QCOM_CLK_BRANCH2_BRANCH_HALT, false, 0), F_BRANCH2(GCC_USB2_MOCK_UTMI_CLK, "gcc_usb2_mock_utmi_clk", @@ -588,7 +588,7 @@ static struct qcom_clk_branch2_def branch2_tbl[] = { F_BRANCH2(GCC_USB3_MASTER_CLK, "gcc_usb3_master_clk", "fepll125", 0x1e028, 0, 0, 0, 0x1e028, QCOM_CLK_BRANCH2_BRANCH_HALT, false, 0), - F_BRANCH2(GCC_USB3_SLEEP_CLK, "gcc_usb3_sleep_clk", "gcc_sleep_clk_src", + F_BRANCH2(GCC_USB3_SLEEP_CLK, "gcc_usb3_sleep_clk", "sleep_clk", 0x1e02c, 0, 0, 0, 0x1e02c, QCOM_CLK_BRANCH2_BRANCH_HALT, false, 0), F_BRANCH2(GCC_USB3_MOCK_UTMI_CLK, "gcc_usb3_mock_utmi_clk", @@ -602,7 +602,12 @@ static struct qcom_clk_branch2_def branch2_tbl[] = { F_BRANCH2(GCC_WCSS2G_REF_CLK, "gcc_wcss2g_ref_clk", "xo", 0x1f00c, 0, 0, 0, 0x1f00c, QCOM_CLK_BRANCH2_BRANCH_HALT, false, QCOM_CLK_BRANCH2_FLAGS_SET_RATE_PARENT), - F_BRANCH2(GCC_WCSS2G_RTC_CLK, "gcc_wcss2g_rtc_clk", "gcc_sleep_clk_src", + /* + * TODO: figure out whether gcc_sleep_clk_src -> sleep_clk is right; + * will need to go consult the openwrt ipq4018 device tree / code + * again! + */ + F_BRANCH2(GCC_WCSS2G_RTC_CLK, "gcc_wcss2g_rtc_clk", "sleep_clk", 0x1f010, 0, 0, 0, 0x1f010, QCOM_CLK_BRANCH2_BRANCH_HALT, false, 0), @@ -613,7 +618,7 @@ static struct qcom_clk_branch2_def branch2_tbl[] = { F_BRANCH2(GCC_WCSS5G_REF_CLK, "gcc_wcss5g_ref_clk", "xo", 0x1f00c, 0, 0, 0, 0x2000c, QCOM_CLK_BRANCH2_BRANCH_HALT, false, QCOM_CLK_BRANCH2_FLAGS_SET_RATE_PARENT), - F_BRANCH2(GCC_WCSS5G_RTC_CLK, "gcc_wcss5g_rtc_clk", "gcc_sleep_clk_src", + F_BRANCH2(GCC_WCSS5G_RTC_CLK, "gcc_wcss5g_rtc_clk", "sleep_clk", 0x1f010, 0, 0, 0, 0x20010, QCOM_CLK_BRANCH2_BRANCH_HALT, false, 0),