git: f05b3c9f4741 - main - qcom_gcc: fix the parent clock to work again

From: Adrian Chadd <adrian_at_FreeBSD.org>
Date: Tue, 13 Sep 2022 03:10:49 UTC
The branch main has been updated by adrian:

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

commit f05b3c9f47411526bb7530210931fac0054075d4
Author:     Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2022-09-12 02:31:23 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
CommitDate: 2022-09-13 03:10:24 +0000

    qcom_gcc: fix the parent clock to work again
    
    Rename it to match the clock-output-names field in the device
    tree.
    
    Reviewed by: imp
    Differential Revision: https://reviews.freebsd.org/D36531
---
 sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c | 8 ++++----
 1 file changed, 4 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 9f3261b3db8c..f25ad53d2c8c 100644
--- a/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c
+++ b/sys/dev/qcom_gcc/qcom_gcc_ipq4018_clock.c
@@ -581,7 +581,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",
-	    "sleep_clk", 0x1e010, 0, 0, 0, 0x1e010,
+	    "gcc_sleep_clk_src", 0x1e010, 0, 0, 0, 0x1e010,
 	    QCOM_CLK_BRANCH2_BRANCH_HALT,
 	    false, 0),
 	F_BRANCH2(GCC_USB2_MOCK_UTMI_CLK, "gcc_usb2_mock_utmi_clk",
@@ -591,7 +591,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", "sleep_clk",
+	F_BRANCH2(GCC_USB3_SLEEP_CLK, "gcc_usb3_sleep_clk", "gcc_sleep_clk_src",
 	    0x1e02c, 0, 0, 0, 0x1e02c, QCOM_CLK_BRANCH2_BRANCH_HALT,
 	    false, 0),
 	F_BRANCH2(GCC_USB3_MOCK_UTMI_CLK, "gcc_usb3_mock_utmi_clk",
@@ -605,7 +605,7 @@ 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", "sleep_clk",
+	F_BRANCH2(GCC_WCSS2G_RTC_CLK, "gcc_wcss2g_rtc_clk", "gcc_sleep_clk_src",
 	    0x1f010, 0, 0, 0, 0x1f010, QCOM_CLK_BRANCH2_BRANCH_HALT,
 	    false, 0),
 
@@ -616,7 +616,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", "sleep_clk",
+	F_BRANCH2(GCC_WCSS5G_RTC_CLK, "gcc_wcss5g_rtc_clk", "gcc_sleep_clk_src",
 	    0x1f010, 0, 0, 0, 0x20010, QCOM_CLK_BRANCH2_BRANCH_HALT,
 	    false, 0),