From c162e3ad189cad87c6d8516fbfe02ee867ed2f78 Mon Sep 17 00:00:00 2001 From: David Dai Date: Wed, 23 Oct 2019 17:11:53 -0700 Subject: [PATCH 1/2] dt-bindings: clock: Add rpmh clock bindings for Lahaina Add binding documentation and IDs for clock rpmh driver on Lahaina. Change-Id: I0a369aa782403dde8564ea229b7bbf2f767def5a --- bindings/clock/qcom,rpmh-clk.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bindings/clock/qcom,rpmh-clk.txt b/bindings/clock/qcom,rpmh-clk.txt index 4f91bbabe353..b2c1c26eee74 100644 --- a/bindings/clock/qcom,rpmh-clk.txt +++ b/bindings/clock/qcom,rpmh-clk.txt @@ -7,6 +7,7 @@ other hardware subsystems via RSC to control clocks. Required properties : - compatible : Shall contain one of the following: + "qcom,lahaina-rpmh-clk" "qcom,kona-rpmh-clk", "qcom,sdm845-rpmh-clk" @@ -29,3 +30,10 @@ Example : #clock-cells = <1>; }; }; + + &apps_rsc { + rpmhcc: clock-controller { + compatible = "qcom,lahaina-rpmh-clk"; + #clock-cells = <1>; + }; + }; From a1ba89b2d5a42ec657bcbabe0c7ec17e4b0a1c35 Mon Sep 17 00:00:00 2001 From: David Dai Date: Wed, 23 Oct 2019 17:12:57 -0700 Subject: [PATCH 2/2] ARM: dts: msm: update clock_rpmh device node for Lahaina Update the device node for rpmh cc under apps_rsc in place of the dummy cc. Also remove the tcxo and bi_tcxo stub devices so that real RPMh clocks can be registered. Change-Id: I2363e06172689cb04081e56134788d585c448387 --- qcom/lahaina.dtsi | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi index 29af63ac7db2..6f7f9ff40068 100644 --- a/qcom/lahaina.dtsi +++ b/qcom/lahaina.dtsi @@ -536,30 +536,6 @@ }; }; - cxo: bi_tcxo { - compatible = "fixed-factor-clock"; - clocks = <&xo_board>; - clock-mult = <1>; - clock-div = <2>; - #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 = <2>; - #clock-cells = <0>; - clock-output-names = "bi_tcxo_ao"; - }; - - clock_rpmh: qcom,rpmhclk { - compatible = "qcom,dummycc"; - clock-output-names = "rpmh_clocks"; - #clock-cells = <1>; - }; - clock_aop: qcom,aopclk { compatible = "qcom,aop-qmp-clk"; #clock-cells = <1>; @@ -1139,6 +1115,11 @@ system_pm { compatible = "qcom,system-pm"; }; + + clock_rpmh: qcom,rpmhclk { + compatible = "qcom,lahaina-rpmh-clk"; + #clock-cells = <1>; + }; }; disp_rsc: rsc@af20000 {