[PATCH] arm64: dts: qcom: sm6150: move standard clocks to SoC dtsi

[PATCH] arm64: dts: qcom: sm6150: move standard clocks to SoC dtsi

[Dmitry Baryshkov]

Follow the example of all other platforms and reference standard clocks
(XO, sleep) from the SoC DT even if they are defined in the board DT
file.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/qcs615-ride.dts | 14 --------------
 arch/arm64/boot/dts/qcom/sm6150.dtsi     |  5 +++++
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/qcs615-ride.dts b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
index 59582d3dc4c49828ef4a0d22a1cbaba715c7ce8c..e663343df75d59481786192cde647017a83c4191 100644
--- a/arch/arm64/boot/dts/qcom/qcs615-ride.dts
+++ b/arch/arm64/boot/dts/qcom/qcs615-ride.dts
@@ -288,12 +288,6 @@ vreg_l17a: ldo17 {
 	};
 };
 
-&gcc {
-	clocks = <&rpmhcc RPMH_CXO_CLK>,
-		 <&rpmhcc RPMH_CXO_CLK_A>,
-		 <&sleep_clk>;
-};
-
 &pcie {
 	perst-gpios = <&tlmm 101 GPIO_ACTIVE_LOW>;
 	wake-gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>;
@@ -369,10 +363,6 @@ &remoteproc_cdsp {
 	status = "okay";
 };
 
-&rpmhcc {
-	clocks = <&xo_board_clk>;
-};
-
 &tlmm {
 	bt_en_state: bt-en-state {
 		pins = "gpio85";
@@ -523,7 +513,3 @@ &ufs_mem_phy {
 
 	status = "okay";
 };
-
-&watchdog {
-	clocks = <&sleep_clk>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm6150.dtsi b/arch/arm64/boot/dts/qcom/sm6150.dtsi
index b66bc13c0b5e337bf9a95b4da4af33b691c14fb5..69e013a17c9f9556f2cc504afefeb6b5f62e3325 100644
--- a/arch/arm64/boot/dts/qcom/sm6150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6150.dtsi
@@ -495,6 +495,9 @@ soc: soc@0 {
 		gcc: clock-controller@100000 {
 			compatible = "qcom,qcs615-gcc";
 			reg = <0 0x00100000 0 0x1f0000>;
+			clocks = <&rpmhcc RPMH_CXO_CLK>,
+				 <&rpmhcc RPMH_CXO_CLK_A>,
+				 <&sleep_clk>;
 
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -3676,6 +3679,7 @@ watchdog: watchdog@17c10000 {
 			compatible = "qcom,apss-wdt-qcs615", "qcom,kpss-wdt";
 			reg = <0x0 0x17c10000 0x0 0x1000>;
 			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&sleep_clk>;
 		};
 
 		timer@17c20000 {
@@ -3765,6 +3769,7 @@ apps_bcm_voter: bcm-voter {
 
 			rpmhcc: clock-controller {
 				compatible = "qcom,qcs615-rpmh-clk";
+				clocks = <&xo_board_clk>;
 				clock-names = "xo";
 
 				#clock-cells = <1>;

---
base-commit: 1357b2649c026b51353c84ddd32bc963e8999603
change-id: 20250816-qcs615-move-clocks-ed9295478d8a

Best regards,
-- 
With best wishes
Dmitry

Re: [PATCH] arm64: dts: qcom: sm6150: move standard clocks to SoC dtsi

[Bjorn Andersson]

On Sat, 16 Aug 2025 17:00:20 +0300, Dmitry Baryshkov wrote:
> Follow the example of all other platforms and reference standard clocks
> (XO, sleep) from the SoC DT even if they are defined in the board DT
> file.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sm6150: move standard clocks to SoC dtsi
      commit: be541b843114d5c92f89b367b51f5dfb76a99124

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>