| Message ID | 20210930182111.57353-5-bjorn.andersson@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 622adb84b3e7c48a888c3df26fbf28679ded660b |
| Headers | show |
| Series | dt-bindings: soc: smem: Make indirection optional | expand |
On Thu, 30 Sep 2021 11:21:11 -0700, Bjorn Andersson wrote: > Now that the SMEM binding and driver allows the SMEM node to be > described in the reserved-memory region directly, move the compatible > and hwlock properties to the reserved-memory node and drop the > standadlone node. > > Applied, thanks! [4/4] arm64: dts: qcom: sdm845: Drop standalone smem node commit: 622adb84b3e7c48a888c3df26fbf28679ded660b Best regards,
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index beee57087d05..64119d2efdcf 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -99,9 +99,11 @@ aop_cmd_db_mem: memory@85fe0000 { no-map; }; - smem_mem: memory@86000000 { + smem@86000000 { + compatible = "qcom,smem"; reg = <0x0 0x86000000 0 0x200000>; no-map; + hwlocks = <&tcsr_mutex 3>; }; tz_mem: memory@86200000 { @@ -941,12 +943,6 @@ tcsr_mutex: hwlock { #hwlock-cells = <1>; }; - smem { - compatible = "qcom,smem"; - memory-region = <&smem_mem>; - hwlocks = <&tcsr_mutex 3>; - }; - smp2p-cdsp { compatible = "qcom,smp2p"; qcom,smem = <94>, <432>;
Now that the SMEM binding and driver allows the SMEM node to be described in the reserved-memory region directly, move the compatible and hwlock properties to the reserved-memory node and drop the standadlone node. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- Changes since v1: - Node name is changed to "smem", as "memory" is reserved for memory nodes. arch/arm64/boot/dts/qcom/sdm845.dtsi | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)