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

Commit 022162f6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Update memory map for sdm845" into msm-4.9

parents 151a0bf9 d2b2c26c
Loading
Loading
Loading
Loading
+35 −11
Original line number Diff line number Diff line
@@ -308,37 +308,61 @@
		pil_modem_mem: modem_region@8b000000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x8b000000 0 0x6e00000>;
			reg = <0 0x8b000000 0 0x7300000>;
		};

		pil_video_mem: pil_video_region@91e00000 {
		pil_video_mem: pil_video_region@92300000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x91e00000 0 0x500000>;
			reg = <0 0x92300000 0 0x500000>;
		};

		pil_cdsp_mem: cdsp_regions@92300000 {
		pil_cdsp_mem: cdsp_regions@92800000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x92300000 0 0x800000>;
			reg = <0 0x92800000 0 0x800000>;
		};

		pil_adsp_mem: pil_adsp_region@92b00000 {
		pil_adsp_mem: pil_adsp_region@93000000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x92b00000 0 0x1a00000>;
			reg = <0 0x93000000 0 0x1a00000>;
		};

		pil_slpi_mem: pil_slpi_region@94500000 {
		pil_mba_mem: pil_mba_region@0x94a00000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x94500000 0 0xf00000>;
			reg = <0 0x94a00000 0 0x200000>;
		};

		pil_spss_mem: spss_region@95400000 {
		pil_slpi_mem: pil_slpi_region@94c00000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x95400000 0 0x700000>;
			reg = <0 0x94c00000 0 0x1400000>;
		};

		pil_ipa_fw_mem: pil_ipa_fw_region@96000000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x96000000 0 0x10000>;
		};

		pil_ipa_gsi_mem: pil_ipa_gsi_region@96010000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x96010000 0 0x5000>;
		};

		pil_gpu_mem: pil_gpu_region@96015000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x96015000 0 0x1000>;
		};

		pil_spss_mem: spss_region@96100000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x96100000 0 0x100000>;
		};

		adsp_mem: adsp_region {