From nobody Tue Sep 13 03:10:49 2022 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 4MRT4V0d75z4cBN0; Tue, 13 Sep 2022 03:10:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MRT4V03y7z4Hb0; Tue, 13 Sep 2022 03:10:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663038650; 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=B/KHGrFQbscscBplAw/6sGHQhYT1m5LKL1/ddoY6mdc=; b=B3D6emT3w6M1/3zwLO3/Rjr2HR1vbs6vAcsUhwrymzPepyxYSWJLciIYapYX0r5Y+J9SGU GKtwVN2Qg+fbLBFBcbztGihIEBQwn7UgRdM7mdNAF3ErifQGRVyLedjA0nuRxP52mmaqqM /IhjcPhu4dby3y5QxRgj70Nz7GUECHd6OYp4KqI9OftD0wwkTeb5ayQKU4H5ql7tVNC42c V2mLHCa30Vmeq/CtjTCdRgDX92tCz/JVy8LuzJQmj6x1+N7CRMRYMUI20Tz0lPqK6bJrE+ 6K9gVx9wvBlYrNGtY7xO6wAevx9zA3ek4+N7bh0DXbrKch+boh3bRjgnL6Hosw== 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 4MRT4T6DV1z1Bg5; Tue, 13 Sep 2022 03:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28D3Anok069725; Tue, 13 Sep 2022 03:10:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28D3AnKJ069724; Tue, 13 Sep 2022 03:10:49 GMT (envelope-from git) Date: Tue, 13 Sep 2022 03:10:49 GMT Message-Id: <202209130310.28D3AnKJ069724@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: f05b3c9f4741 - main - qcom_gcc: fix the parent clock to work again 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: f05b3c9f47411526bb7530210931fac0054075d4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663038650; 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=B/KHGrFQbscscBplAw/6sGHQhYT1m5LKL1/ddoY6mdc=; b=EkQ+d7ZxA8Vr832IZ96rJ9iGzYBERKeMkpMufjPHOiCYCXVDTQAOIlZ9yFuF8LlDooYT1c PYzkguRd4qWgT7Py7ROZKq8QMqM1043gvTbf18Vevba4mJ0JqvjX31j9UnD0/YStedmHsU JrdqqcwAzEtFX/ASOd5Q/B5p5E7r2CGZD1PEZdj4Y2j1tW+uJRqd166hZNcQfvFsUTZTM7 uyisCrrXy9gReCCJUZKofCscN9Jq5mcszeuoT0yFhLBxvpyD1EvGohfMGnLrEf+k8iDEgQ fbit6LYhTRAvDQrR0mBUxG7JLSH5LQIJavWMbZTVIWIDL/knvkzbL5VHPC8IZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663038650; a=rsa-sha256; cv=none; b=NDmHsgBVobxBKDwjegonhvoQVTJJcU6laqSupzNufGh8DvVLZ8juuIxeVYI/yiwSNuQ5eg lTHhRomj1D/pTI/rU/4UzF+DsyC+6rgraquikKbtLZ0qXharvxeKI+d7JRDewhqoTMyCpa CcT2BpTNJOo//JqcwYe6cU6AO+xdSn8SIJlwTctOEPAHZeEW5b8ptiI+RtXQNzgPrVqF9K jMu/uaPYvaFRhhKm8AWoAH9glM7ignDrxQ2jt5y6eBEXw5kJInFU7LDLB87tij5gyA3b9y vzPAWAFvIYWpxhv++KeVPwifbSViWbDsy9/E8fPOxbq+rykMzF22rcY3/V+pSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=f05b3c9f47411526bb7530210931fac0054075d4 commit f05b3c9f47411526bb7530210931fac0054075d4 Author: Adrian Chadd AuthorDate: 2022-09-12 02:31:23 +0000 Commit: Adrian Chadd 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),