Merge "ARM: dts: msm: Update V5 32 bit memory map for Scuba" (976df727) · Commits · e / devices / android_kernel_oneplus_sm7250

qcom/scuba-low-ram.dtsi

+5 −5

Original line number	Diff line number	Diff line
		#include "scuba.dtsi"
		/ {
		reserved-memory {
		/delete-node/ removed_region@a0000000;
		/delete-node/ removed_region@60000000;
		/delete-node/ qseecom_region;
		/delete-node/ qseecom_ta_region;

		tz_removed_region: tz_removed_region@a0000000 {
		tz_removed_region: tz_removed_region@60000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0xa0000000 0x0 0x100000>;
		reg = <0x0 0x60000000 0x0 0x100000>;
		};

		pimem_removed_region: pimem_removed_region@a0e00000 {
		pimem_removed_region: pimem_removed_region@60100000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0xa0e00000 0x0 0x1100000>;
		reg = <0x0 0x60100000 0x0 0x1e00000>;
		};

		qseecom_mem: qseecom_region {

qcom/scuba.dtsi

+24 −24

Original line number	Diff line number	Diff line
		@@ -186,76 +186,76 @@
		#size-cells = <2>;
		ranges;

		hyp_region: hyp_region@85700000 {
		hyp_region: hyp_region@45700000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x85700000 0x0 0x600000>;
		reg = <0x0 0x45700000 0x0 0x600000>;
		};

		xbl_aop_mem: xbl_aop_mem@85e00000 {
		xbl_aop_mem: xbl_aop_mem@45e00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x85e00000 0x0 0x100000>;
		reg = <0x0 0x45e00000 0x0 0x100000>;
		};

		sec_apps_mem: sec_apps_region@85fff000 {
		sec_apps_mem: sec_apps_region@45fff000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x85fff000 0x0 0x1000>;
		reg = <0x0 0x45fff000 0x0 0x1000>;
		};

		smem_region: smem@86000000 {
		smem_region: smem@46000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x86000000 0x0 0x200000>;
		reg = <0x0 0x46000000 0x0 0x200000>;
		};

		pil_modem_mem: modem_region@8ab00000 {
		pil_modem_mem: modem_region@4ab00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8ab00000 0x0 0x6900000>;
		reg = <0x0 0x4ab00000 0x0 0x6900000>;
		};

		pil_video_mem: pil_video_region@91400000 {
		pil_video_mem: pil_video_region@51400000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x91400000 0x0 0x500000>;
		reg = <0x0 0x51400000 0x0 0x500000>;
		};

		wlan_msa_mem: wlan_msa_region@91900000 {
		wlan_msa_mem: wlan_msa_region@51900000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x91900000 0x0 0x200000>;
		reg = <0x0 0x51900000 0x0 0x100000>;
		};

		pil_adsp_mem: adsp_regions@91b00000 {
		pil_adsp_mem: adsp_regions@51a00000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x91b00000 0x0 0x1c00000>;
		reg = <0x0 0x51a00000 0x0 0x1c00000>;
		};

		pil_ipa_fw_mem: ips_fw_region@93700000 {
		pil_ipa_fw_mem: ips_fw_region@53600000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x93700000 0x0 0x10000>;
		reg = <0x0 0x53600000 0x0 0x10000>;
		};

		pil_ipa_gsi_mem: ipa_gsi_region@93710000 {
		pil_ipa_gsi_mem: ipa_gsi_region@53610000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x93710000 0x0 0x5000>;
		reg = <0x0 0x53610000 0x0 0x5000>;
		};

		pil_gpu_mem: gpu_region@93715000 {
		pil_gpu_mem: gpu_region@53615000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x93715000 0x0 0x2000>;
		reg = <0x0 0x53615000 0x0 0x2000>;
		};

		removed_region: removed_region@a0000000 {
		removed_region: removed_region@60000000 {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0xa0000000 0x0 0x3900000>;
		reg = <0x0 0x60000000 0x0 0x3900000>;
		};

		adsp_mem: adsp_region {