Skip to content

Commit 325c6a4

Browse files
lumagandersson
authored andcommitted
ARM: dts: qcom: apq8064 merge hw splinlock into corresponding syscon device
Follow up the expected way of describing the SFPB hwspinlock and merge hwspinlock node into corresponding syscon node, fixing several dt-schema warnings. Fixes: 24a9baf ("ARM: dts: qcom: apq8064: Add hwmutex and SMEM nodes") Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 4b0eb14 commit 325c6a4

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

arch/arm/boot/dts/qcom/qcom-apq8064.dtsi

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,6 @@
213213
};
214214
};
215215

216-
sfpb_mutex: hwmutex {
217-
compatible = "qcom,sfpb-mutex";
218-
syscon = <&sfpb_wrapper_mutex 0x604 0x4>;
219-
#hwlock-cells = <1>;
220-
};
221-
222216
smem {
223217
compatible = "qcom,smem";
224218
memory-region = <&smem_region>;
@@ -305,9 +299,10 @@
305299
pinctrl-0 = <&ps_hold_default_state>;
306300
};
307301

308-
sfpb_wrapper_mutex: syscon@1200000 {
309-
compatible = "syscon";
310-
reg = <0x01200000 0x8000>;
302+
sfpb_mutex: hwmutex@1200600 {
303+
compatible = "qcom,sfpb-mutex";
304+
reg = <0x01200600 0x100>;
305+
#hwlock-cells = <1>;
311306
};
312307

313308
intc: interrupt-controller@2000000 {

0 commit comments

Comments
 (0)