Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2835d749 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update v7.64 memory map for bengal"

parents 2faa2073 f279525e
Loading
Loading
Loading
Loading
+28 −28
Original line number Diff line number Diff line
@@ -288,82 +288,82 @@
		#size-cells = <2>;
		ranges;

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

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

		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_mem: smem_region@86000000 {
		smem_mem: smem_region@46000000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x86000000 0x0 0x200000>;
			reg = <0x0 0x46000000 0x0 0x200000>;
		};

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

		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_cdsp_mem: cdsp_regions@91b00000 {
		pil_cdsp_mem: cdsp_regions@51a00000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x91b00000 0x0 0x1e00000>;
			reg = <0x0 0x51a00000 0x0 0x1e00000>;
		};

		pil_adsp_mem: pil_adsp_region@93900000 {
		pil_adsp_mem: pil_adsp_region@53800000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x93900000 0x0 0x1e00000>;
			reg = <0x0 0x53800000 0x0 0x1e00000>;
		};

		pil_ipa_fw_mem: ipa_fw_region@95700000 {
		pil_ipa_fw_mem: ipa_fw_region@55600000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x95700000 0x0 0x10000>;
			reg = <0x0 0x55600000 0x0 0x10000>;
		};

		pil_ipa_gsi_mem: ipa_gsi_region@95710000 {
		pil_ipa_gsi_mem: ipa_gsi_region@55610000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x95710000 0x0 0x5000>;
			reg = <0x0 0x55610000 0x0 0x5000>;
		};

		pil_gpu_mem: gpu_region@95715000 {
		pil_gpu_mem: gpu_region@55615000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x95715000 0x0 0x2000>;
			reg = <0x0 0x55615000 0x0 0x2000>;
		};

		user_contig_mem: user_contig_region {
@@ -390,10 +390,10 @@
			size = <0x0 0x1000000>;
		};

		cdsp_sec_mem: cdsp_sec_regions@86200000 {
		cdsp_sec_mem: cdsp_sec_regions@46200000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x86200000 0x0 0x1e00000>;
			reg = <0x0 0x46200000 0x0 0x1e00000>;
		};

		secure_display_memory: secure_display_region {