arm64: dts: qcom: msm8996: split TCSR halt regs out of mutex

The TCSR halt regs are next to TCSR mutex (in one address block called
TCSR_MUTEX), so before converting the TCSR mutex into device with
address space, we need to split the halt regs to its own syscon device.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220819083209.50844-3-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 742eac4ce9b3537d089be71077fb76931a4ab3a7..3411ced96db679e5bb4cf262010df0564f8f4e4e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -359,7 +359,7 @@
        firmware {
                scm {
                        compatible = "qcom,scm-msm8996", "qcom,scm";
-                       qcom,dload-mode = <&tcsr 0x13000>;
+                       qcom,dload-mode = <&tcsr_2 0x13000>;
                };
        };
 
@@ -840,10 +840,15 @@
 
                tcsr_mutex_regs: syscon@740000 {
                        compatible = "syscon";
-                       reg = <0x00740000 0x40000>;
+                       reg = <0x00740000 0x20000>;
                };
 
-               tcsr: syscon@7a0000 {
+               tcsr_1: sycon@760000 {
+                       compatible = "qcom,tcsr-msm8996", "syscon";
+                       reg = <0x00760000 0x20000>;
+               };
+
+               tcsr_2: syscon@7a0000 {
                        compatible = "qcom,tcsr-msm8996", "syscon";
                        reg = <0x007a0000 0x18000>;
                };
@@ -2413,7 +2418,7 @@
                        qcom,smem-states = <&mpss_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
 
-                       qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>;
+                       qcom,halt-regs = <&tcsr_1 0x3000 0x5000 0x4000>;
 
                        status = "disabled";