arm64: dts: qcom: sc7180: Update reserved memory map

Add missing regions and remove unused regions from the reserved memory
map, as described in version 5.

Tested-by: Evan Green <evgreen@chromium.org>
Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Link: https://lore.kernel.org/r/20200421143228.8981-6-sibis@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index 4dd8ebc..c7c1eff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -28,6 +28,59 @@
        };
 };
 
+/*
+ * Reserved memory changes
+ *
+ * Delete all unused memory nodes and define the peripheral memory regions
+ * required by the board dts.
+ *
+ */
+
+/delete-node/ &hyp_mem;
+/delete-node/ &xbl_mem;
+/delete-node/ &aop_mem;
+/delete-node/ &sec_apps_mem;
+/delete-node/ &tz_mem;
+
+/* Increase the size from 2MB to 8MB */
+&rmtfs_mem {
+       reg = <0x0 0x84400000 0x0 0x800000>;
+};
+
+/ {
+       reserved-memory {
+               atf_mem: memory@80b00000 {
+                       reg = <0x0 0x80b00000 0x0 0x100000>;
+                       no-map;
+               };
+
+               mpss_mem: memory@86000000 {
+                       reg = <0x0 0x86000000 0x0 0x8c00000>;
+                       no-map;
+               };
+
+               camera_mem: memory@8ec00000 {
+                       reg = <0x0 0x8ec00000 0x0 0x500000>;
+                       no-map;
+               };
+
+               venus_mem: memory@8f600000 {
+                       reg = <0 0x8f600000 0 0x500000>;
+                       no-map;
+               };
+
+               wlan_mem: memory@94100000 {
+                       reg = <0x0 0x94100000 0x0 0x200000>;
+                       no-map;
+               };
+
+               mba_mem: memory@94400000 {
+                       reg = <0x0 0x94400000 0x0 0x200000>;
+                       no-map;
+               };
+       };
+};
+
 &apps_rsc {
        pm6150-rpmh-regulators {
                compatible = "qcom,pm6150-rpmh-regulators";

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 4216b57..0b9ca95 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -70,20 +70,49 @@
                #size-cells = <2>;
                ranges;
 
+               hyp_mem: memory@80000000 {
+                       reg = <0x0 0x80000000 0x0 0x600000>;
+                       no-map;
+               };
+
+               xbl_mem: memory@80600000 {
+                       reg = <0x0 0x80600000 0x0 0x200000>;
+                       no-map;
+               };
+
+               aop_mem: memory@80800000 {
+                       reg = <0x0 0x80800000 0x0 0x20000>;
+                       no-map;
+               };
+
                aop_cmd_db_mem: memory@80820000 {
                        reg = <0x0 0x80820000 0x0 0x20000>;
                        compatible = "qcom,cmd-db";
                };
 
+               sec_apps_mem: memory@808ff000 {
+                       reg = <0x0 0x808ff000 0x0 0x1000>;
+                       no-map;
+               };
+
                smem_mem: memory@80900000 {
                        reg = <0x0 0x80900000 0x0 0x200000>;
                        no-map;
                };
 
-               venus_mem: memory@8f600000 {
-                       reg = <0 0x8f600000 0 0x500000>;
+               tz_mem: memory@80b00000 {
+                       reg = <0x0 0x80b00000 0x0 0x3900000>;
                        no-map;
                };
+
+               rmtfs_mem: memory@84400000 {
+                       compatible = "qcom,rmtfs-mem";
+                       reg = <0x0 0x84400000 0x0 0x200000>;
+                       no-map;
+
+                       qcom,client-id = <1>;
+                       qcom,vmid = <15>;
+               };
        };
 
        cpus {