From: Stephan Gerhold <stephan@gerhold.net>
Date: Tue, 15 Sep 2020 07:12:13 +0000 (+0200)
Subject: arm64: dts: qcom: msm8916: Drop qcom,tcsr-mutex syscon
X-Git-Tag: v5.10-rc1~26^2~25^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5342f1df8f50df3cec6e015beefc4eca79eb858d;p=thirdparty%2Fkernel%2Flinux.git

arm64: dts: qcom: msm8916: Drop qcom,tcsr-mutex syscon

The hwlock device node does not (directly) use memory resources
of the SoC, so we should move it outside the "soc" node.

However, as of commit 7a1e6fb1c606 ("hwspinlock: qcom: Allow mmio usage
in addition to syscon") we can now assign the memory region directly
to the hwlock device node. This works because the register space
used by it is actually separate and not used by any other components.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200915071221.72895-7-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 003451ccf3ee8..10e177988555b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -458,9 +458,10 @@
 			reg = <0x1800000 0x80000>;
 		};
 
-		tcsr_mutex_regs: syscon@1905000 {
-			compatible = "syscon";
+		tcsr_mutex: hwlock@1905000 {
+			compatible = "qcom,tcsr-mutex";
 			reg = <0x1905000 0x20000>;
+			#hwlock-cells = <1>;
 		};
 
 		tcsr: syscon@1937000 {
@@ -468,12 +469,6 @@
 			reg = <0x1937000 0x30000>;
 		};
 
-		tcsr_mutex: hwlock {
-			compatible = "qcom,tcsr-mutex";
-			syscon = <&tcsr_mutex_regs 0 0x1000>;
-			#hwlock-cells = <1>;
-		};
-
 		rpm_msg_ram: memory@60000 {
 			compatible = "qcom,rpm-msg-ram";
 			reg = <0x60000 0x8000>;