Skip to content

Commit 2b3931e

Browse files
krzkgregkh
authored andcommitted
arm64: dts: qcom: ipq6018: switch TCSR mutex to MMIO
[ Upstream commit f5e303a ] The TCSR mutex bindings allow device to be described only with address space (so it uses MMIO, not syscon regmap). This seems reasonable as TCSR mutex is actually a dedicated IO address space and it also fixes DT schema checks: qcom/ipq6018-cp01-c1.dtb: hwlock: 'reg' is a required property qcom/ipq6018-cp01-c1.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20220909092035.223915-12-krzysztof.kozlowski@linaro.org Stable-dep-of: 72fc3d5 ("arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent bdda1c3 commit 2b3931e

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

arch/arm64/boot/dts/qcom/ipq6018.dtsi

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,6 @@
129129
};
130130
};
131131

132-
tcsr_mutex: hwlock {
133-
compatible = "qcom,tcsr-mutex";
134-
syscon = <&tcsr_mutex_regs 0 0x80>;
135-
#hwlock-cells = <1>;
136-
};
137-
138132
pmuv8: pmu {
139133
compatible = "arm,cortex-a53-pmu";
140134
interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
@@ -242,9 +236,10 @@
242236
#reset-cells = <1>;
243237
};
244238

245-
tcsr_mutex_regs: syscon@1905000 {
246-
compatible = "syscon";
247-
reg = <0x0 0x01905000 0x0 0x8000>;
239+
tcsr_mutex: hwlock@1905000 {
240+
compatible = "qcom,ipq6018-tcsr-mutex", "qcom,tcsr-mutex";
241+
reg = <0x0 0x01905000 0x0 0x1000>;
242+
#hwlock-cells = <1>;
248243
};
249244

250245
tcsr_q6: syscon@1945000 {

0 commit comments

Comments
 (0)