From e4710386ff2384f83768d40d50380bfcbc113f3f Mon Sep 17 00:00:00 2001 From: Vivek Aknurwar Date: Tue, 17 Oct 2023 17:16:55 -0700 Subject: [PATCH 1/3] ARM: dts: msm: Use correct UFS ref_clk on RUMI for Sun Add RPMH_CXO_CLK as ref_clk to UFS for Sun on pre-sil. On Rumi ref_clk is to UFS PHY is 19.2MHz and actual device it is 38.4MHz. Also update correct gcc header file for sun. Change-Id: I78ed60095e5229405e7962f4676bfab7b7556676 Signed-off-by: Vivek Aknurwar --- qcom/sun-rumi.dtsi | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/qcom/sun-rumi.dtsi b/qcom/sun-rumi.dtsi index 23627068..6e33d966 100644 --- a/qcom/sun-rumi.dtsi +++ b/qcom/sun-rumi.dtsi @@ -4,7 +4,8 @@ */ #include -#include +#include +#include #include #include "sun-pmic-overlay.dtsi" @@ -141,6 +142,27 @@ vdda-qref-supply = <&pm_v8i_l3>; vdda-qref-max-microamp = <30000>; + clock-names = + "core_clk", + "bus_aggr_clk", + "iface_clk", + "core_clk_unipro", + "core_clk_ice", + "ref_clk", + "tx_lane0_sync_clk", + "rx_lane0_sync_clk", + "rx_lane1_sync_clk"; + clocks = + <&gcc GCC_UFS_PHY_AXI_CLK>, + <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>, + <&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>, + <&gcc GCC_UFS_PHY_ICE_CORE_CLK>, + <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>, + <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>, + <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>; + qcom,disable-lpm; status = "ok"; From b535b646153a3dcd39a09eb9ee33cb5e7327817c Mon Sep 17 00:00:00 2001 From: Xubin Bai Date: Fri, 8 Sep 2023 04:28:39 -0700 Subject: [PATCH 2/3] dt-bindings: clock: Add rpmh-clk bindings for Sun Add rpmh clock bindings for Sun. Change-Id: Ib49451eebb4d9959375b55570b4bd4893401d3ec Signed-off-by: Xubin Bai Signed-off-by: Vivek Aknurwar --- bindings/clock/qcom,rpmhcc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/clock/qcom,rpmhcc.yaml b/bindings/clock/qcom,rpmhcc.yaml index ef15586f..ad7912e7 100644 --- a/bindings/clock/qcom,rpmhcc.yaml +++ b/bindings/clock/qcom,rpmhcc.yaml @@ -31,6 +31,7 @@ properties: - qcom,sm8350-rpmh-clk - qcom,sm8450-rpmh-clk - qcom,pineapple-rpmh-clk + - qcom,sun-rpmh-clk clocks: maxItems: 1 From ad62d3ca63df7799747abbe6120a613a259ecac3 Mon Sep 17 00:00:00 2001 From: Xubin Bai Date: Fri, 8 Sep 2023 04:30:38 -0700 Subject: [PATCH 3/3] ARM: dts: msm: Enable clock rpmh device node for Sun Remove fixed-factor-clock and enable device node for rpmh clocks under apps_rsc in place of fixed clocks. Change-Id: I9c4d242882f29f616574e339581722b65f27a74f Signed-off-by: Xubin Bai --- qcom/sun.dtsi | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi index 4338045b..21b0a1db 100644 --- a/qcom/sun.dtsi +++ b/qcom/sun.dtsi @@ -656,9 +656,15 @@ , ; }; + apps_bcm_voter: bcm_voter { compatible = "qcom,bcm-voter"; }; + + rpmhcc: clock-controller { + compatible = "qcom,sun-rpmh-clk"; + #clock-cells = <1>; + }; }; }; @@ -713,31 +719,6 @@ }; }; - cxo: bi_tcxo { - compatible = "fixed-factor-clock"; - clocks = <&xo_board>; - clock-mult = <1>; - clock-div = <4>; - #clock-cells = <0>; - clock-output-names = "bi_tcxo"; - }; - - cxo_a: bi_tcxo_ao { - compatible = "fixed-factor-clock"; - clocks = <&xo_board>; - clock-mult = <1>; - clock-div = <4>; - #clock-cells = <0>; - clock-output-names = "bi_tcxo_ao"; - }; - - rpmhcc: clock-controller { - compatible = "fixed-clock"; - clock-output-names = "rpmh_clocks"; - clock-frequency = <19200000>; - #clock-cells = <1>; - }; - cambistmclkcc: clock-controller@1760000 { compatible = "qcom,sun-cambistmclkcc", "syscon"; reg = <0x1760000 0x6000>;