From 8c28382bc20d52b9da94bb8fe1e59a599c5c7ea3 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 8 Jun 2023 12:26:47 +0300 Subject: [PATCH] Revert "arm64: dts: vendor: qcom: Update cpu cooling device node" We'll take the upstream update instead, which is different. This reverts commit 1720e2bbf9ee94af88ff113d71612ef89852628f. Change-Id: I2314465041b23826023fb0ff6dcf39fd119f2056 --- arch/arm64/boot/dts/vendor/qcom/lahaina-thermal.dtsi | 3 +-- arch/arm64/boot/dts/vendor/qcom/shima-thermal.dtsi | 3 +-- arch/arm64/boot/dts/vendor/qcom/yupik-thermal.dtsi | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal.dtsi b/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal.dtsi index 462676e4dc5c..4fadb7a87f45 100644 --- a/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/lahaina-thermal.dtsi @@ -172,8 +172,7 @@ qcom,cpu-voltage-cdev { compatible = "qcom,cc-cooling-devices"; apc1_cluster: qcom,apc1-cluster { - qcom,cluster0 = <&CPU4>; - qcom,cluster1 = <&CPU7>; + qcom,cpus = <&CPU4 &CPU7>; #cooling-cells = <2>; }; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/shima-thermal.dtsi b/arch/arm64/boot/dts/vendor/qcom/shima-thermal.dtsi index f38d08066ab8..a5b819e44a9c 100644 --- a/arch/arm64/boot/dts/vendor/qcom/shima-thermal.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/shima-thermal.dtsi @@ -200,8 +200,7 @@ qcom,cpu-voltage-cdev { compatible = "qcom,cc-cooling-devices"; apc1_cluster: qcom,apc1-cluster { - qcom,cluster0 = <&CPU4>; - qcom,cluster1 = <&CPU7>; + qcom,cpus = <&CPU4 &CPU7>; #cooling-cells = <2>; }; }; diff --git a/arch/arm64/boot/dts/vendor/qcom/yupik-thermal.dtsi b/arch/arm64/boot/dts/vendor/qcom/yupik-thermal.dtsi index 49cb50a0a3dd..a9d549cfe7b1 100644 --- a/arch/arm64/boot/dts/vendor/qcom/yupik-thermal.dtsi +++ b/arch/arm64/boot/dts/vendor/qcom/yupik-thermal.dtsi @@ -232,8 +232,7 @@ qcom,cpu-voltage-cdev { compatible = "qcom,cc-cooling-devices"; apc1_cluster: qcom,apc1-cluster { - qcom,cluster0 = <&CPU4>; - qcom,cluster1 = <&CPU7>; + qcom,cpus = <&CPU4 &CPU7>; #cooling-cells = <2>; }; };