git: 7d2eef229f1e - main - qcom_gcc: migrate to use sleep_clk directly

The branch main has been updated by adrian:

URL: https://cgit.FreeBSD.org/src/commit/?id=7d2eef229f1e77b1cd68b98c002e913234ffc350

commit 7d2eef229f1e77b1cd68b98c002e913234ffc350
Author:     Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2025-04-05 20:33:28 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
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),