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

[platform/kernel/linux-starfive.git] / arch / arm64 / boot / dts / qcom / sm8150.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 916f12b..cef8c4f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -585,12 +585,6 @@
                };
        };
 
-       tcsr_mutex: hwlock {
-               compatible = "qcom,tcsr-mutex";
-               syscon = <&tcsr_mutex_regs 0 0x1000>;
-               #hwlock-cells = <1>;
-       };
-
        memory@80000000 {
                device_type = "memory";
                /* We expect the bootloader to fill in the size */
@@ -2054,9 +2048,15 @@
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
-               tcsr_mutex_regs: syscon@1f40000 {
-                       compatible = "syscon";
-                       reg = <0x0 0x01f40000 0x0 0x40000>;
+               tcsr_mutex: hwlock@1f40000 {
+                       compatible = "qcom,tcsr-mutex";
+                       reg = <0x0 0x01f40000 0x0 0x20000>;
+                       #hwlock-cells = <1>;
+               };
+
+               tcsr_regs_1: syscon@1f60000 {
+                       compatible = "qcom,sm8150-tcsr", "syscon";
+                       reg = <0x0 0x01f60000 0x0 0x20000>;
                };
 
                remoteproc_slpi: remoteproc@2400000 {