Merge tag 'arm-dt-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sm8350.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index 4b19744..d242bab 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -1443,6 +1443,8 @@
                        interconnect-names = "memory",
                                             "config";
 
+                       qcom,qmp = <&aoss_qmp>;
+
                        qcom,smem-states = <&ipa_smp2p_out 0>,
                                           <&ipa_smp2p_out 1>;
                        qcom,smem-state-names = "ipa-clock-enabled-valid",
@@ -1820,7 +1822,7 @@
                        qcom,tcs-offset = <0xd00>;
                        qcom,drv-id = <2>;
                        qcom,tcs-config = <ACTIVE_TCS  2>, <SLEEP_TCS   3>,
-                                         <WAKE_TCS    3>, <CONTROL_TCS 1>;
+                                         <WAKE_TCS    3>, <CONTROL_TCS 0>;
 
                        rpmhcc: clock-controller {
                                compatible = "qcom,sm8350-rpmh-clk";
@@ -3009,7 +3011,7 @@
                        };
                };
 
-               gpu-thermal-top {
+               gpu-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -3024,7 +3026,7 @@
                        };
                };
 
-               gpu-thermal-bottom {
+               gpu-bottom-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -3114,7 +3116,7 @@
                        };
                };
 
-               modem1-thermal-top {
+               modem1-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -3129,7 +3131,7 @@
                        };
                };
 
-               modem2-thermal-top {
+               modem2-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -3144,7 +3146,7 @@
                        };
                };
 
-               modem3-thermal-top {
+               modem3-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -3159,7 +3161,7 @@
                        };
                };
 
-               modem4-thermal-top {
+               modem4-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -3174,7 +3176,7 @@
                        };
                };
 
-               camera-thermal-top {
+               camera-top-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;
 
@@ -3189,7 +3191,7 @@
                        };
                };
 
-               cam-thermal-bottom {
+               cam-bottom-thermal {
                        polling-delay-passive = <250>;
                        polling-delay = <1000>;