arm64: dts: qcom: Fix node name of rpm-msg-ram device nodes
PATCH 1/2 arm64: dts: qcom: Fix node name of rpm-msg-ram device nodes
According to the new DT schema for qcom,rpm-msg-ram the node name should be sram@. memory@ is reserved for definition of physical RAM (usable by Linux).
This fixes the following dtbs_check error on various device trees:
memory@60000: 'device_type' is a required property
From schema: dtschema/schemas/memory.yaml
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm6125.dtsi | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +1 -1
@@ -445,7 +445,7 @@ tsens_calsel: calsel@ec { }; }; - rpm_msg_ram: memory@60000 { + rpm_msg_ram: sram@60000 { compatible = "qcom,rpm-msg-ram"; reg = <0x00060000 0x8000>; };
arch/arm64/boot/dts/qcom/msm8994.dtsi +1 -1
@@ -715,7 +715,7 @@ gcc: clock-controller@fc400000 { reg = <0xfc400000 0x2000>; }; - rpm_msg_ram: memory@fc428000 { + rpm_msg_ram: sram@fc428000 { compatible = "qcom,rpm-msg-ram"; reg = <0xfc428000 0x4000>; };
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
@@ -638,7 +638,7 @@ pciephy_2: lane@37000 { }; }; - rpm_msg_ram: memory@68000 { + rpm_msg_ram: sram@68000 { compatible = "qcom,rpm-msg-ram"; reg = <0x00068000 0x6000>; };
arch/arm64/boot/dts/qcom/msm8998.dtsi +1 -1
@@ -865,7 +865,7 @@ gcc: clock-controller@100000 { clocks = <&xo>, <&sleep_clk>; }; - rpm_msg_ram: memory@778000 { + rpm_msg_ram: sram@778000 { compatible = "qcom,rpm-msg-ram"; reg = <0x00778000 0x7000>; };
arch/arm64/boot/dts/qcom/qcs404.dtsi +1 -1
@@ -318,7 +318,7 @@ turingcc: clock-controller@800000 { status = "disabled"; }; - rpm_msg_ram: memory@60000 { + rpm_msg_ram: sram@60000 { compatible = "qcom,rpm-msg-ram"; reg = <0x00060000 0x6000>; };
arch/arm64/boot/dts/qcom/sdm630.dtsi +1 -1
@@ -541,7 +541,7 @@ gcc: clock-controller@100000 { <&sleep_clk>; }; - rpm_msg_ram: memory@778000 { + rpm_msg_ram: sram@778000 { compatible = "qcom,rpm-msg-ram"; reg = <0x00778000 0x7000>; };
arch/arm64/boot/dts/qcom/sm6125.dtsi +1 -1
@@ -380,7 +380,7 @@ hsusb_phy1: phy@1613000 { status = "disabled"; }; - rpm_msg_ram: memory@45f0000 { + rpm_msg_ram: sram@45f0000 { compatible = "qcom,rpm-msg-ram"; reg = <0x045f0000 0x7000>; };
Signature · 1 line
2.33.0
PATCH 2/2 arm64: dts: qcom: msm8916: Drop standalone smem node
SMEM can now be described directly in the reserved-memory. This is mainly meant for newer SoCs where there is only one SMEM region. However, even on older SoCs like MSM8916 there is clearly one main SMEM region (described by "memory-region") that holds the smem_header and one special extra region used only for data of the RPM ("qcom,rpm-msg-ram").
The definition in reserved-memory also looks cleaner for older SoCs, so make use of that in MSM8916 as well.
---
I don't have a strong opinion about this so if you think the extra node is better for MSM8916 feel free to just skip this patch. It works just fine though. :)
--- arch/arm64/boot/dts/qcom/msm8916.dtsi | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
arch/arm64/boot/dts/qcom/msm8916.dtsi +5 -10
@@ -41,9 +41,13 @@ tz-apps@86000000 { no-map; }; - smem_mem: smem@86300000 { + smem@86300000 { + compatible = "qcom,smem"; reg = <0x0 0x86300000 0x0 0x100000>; no-map; + + hwlocks = <&tcsr_mutex 3>; + qcom,rpm-msg-ram = <&rpm_msg_ram>; }; hypervisor@86400000 {
@@ -323,15 +327,6 @@ rpmpd_opp_super_turbo: opp6 { }; }; - smem { - compatible = "qcom,smem"; - - memory-region = <&smem_mem>; - qcom,rpm-msg-ram = <&rpm_msg_ram>; - - hwlocks = <&tcsr_mutex 3>; - }; - smp2p-hexagon { compatible = "qcom,smp2p"; qcom,smem = <435>, <428>;
Signature · 1 line
2.33.0