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

Commit 920728dc authored by Shiraz Hashim's avatar Shiraz Hashim Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Add memory map for msm8952 



Add memory regions which includes carve-outs, CMA and
other reserved regions for msm8952 and update the ion
nodes.

Change-Id: I58c08e08df625c5c948f34c43a3139064c9df895
Signed-off-by: default avatarShiraz Hashim <shashim@codeaurora.org>
parent e9171c1c

arch/arm/boot/dts/qcom/msm8952-ion.dtsi

+4 −23
Original line number Diff line number Diff line
@@ -27,45 +27,26 @@ 
		};



		qcom,ion-heap@8 { /* CP_MM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <8>;

			qcom,heap-align = <0x1000>;

			linux,contiguous-region = <&secure_mem>;

			memory-region = <&secure_mem>;

			qcom,ion-heap-type = "SECURE_DMA";

		};



		qcom,ion-heap@27 { /* QSEECOM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <27>;

			linux,contiguous-region = <&qseecom_mem>;

			memory-region = <&qseecom_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@28 { /* AUDIO HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <28>;

			linux,contiguous-region = <&audio_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@23 { /* OTHER PIL HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <23>;

			linux,contiguous-region = <&reloc_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@26 { /* MODEM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <26>;

			linux,contiguous-region = <&modem_mem>;

			memory-region = <&audio_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@22 {

			compatible = "qcom,msm-ion-reserve";

			reg = <22>;

			linux,contiguous-region = <&adsp_mem>;

			memory-region = <&adsp_mem>;

			qcom,ion-heap-type = "DMA";

		};

	};

arch/arm/boot/dts/qcom/msm8952.dtsi

+26 −35
Original line number Diff line number Diff line
@@ -35,70 +35,61 @@ 
		i2c3 = &i2c_3;

	};



	memory {

	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		modem_mem: modem_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x86800000 0x0 0x06900000>;

			label = "modem_mem";

		};



		reloc_mem: reloc_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8d100000 0x0 0x1b00000>;

			label = "reloc_mem";

		};



		other_ext_mem: other_ext_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x84a00000 0x0 0x1e00000>;

			label = "other_ext_mem";

		};



		venus_mem: venus_region@0 {

			linux,reserve-contiguous-region;

			linux,memory-limit = <0x90000000>;

			reg = <0 0 0 0x0500000>;

			label = "venus_mem";

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x0800000>;

		};



		secure_mem: secure_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x6D00000>;

			label = "secure_mem";

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x7000000>;

		};



		qseecom_mem: qseecom_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x1000000>;

			label = "qseecom_mem";

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x1000000>;

		};



		audio_mem: audio_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x314000>;

			label = "audio_mem";

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x400000>;

		};



		cont_splash_mem: splash_region@83000000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			reg = <0x0 0x83000000 0x0 0x1400000>;

			label = "cont_splash_mem";

		};



		adsp_mem: adsp_region@0 {

			linux,reserve-contiguous-region;

			reg = <0 0 0 0x400000>;

			label = "adsp_mem";

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x400000>;

		};

	};
@@ -1277,7 +1268,7 @@ 
		/* GPIO output to lpass */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;



		linux,contiguous-region = <&reloc_mem>;

		memory-region = <&reloc_mem>;

	};



	spmi_bus: qcom,spmi@200f000 {
@@ -1335,7 +1326,7 @@ 
		qcom,pas-id = <9>;

		qcom,proxy-timeout-ms = <100>;

		qcom,firmware-name = "venus";

		linux,contiguous-region = <&venus_mem>;

		memory-region = <&venus_mem>;

	};



	spi_0: spi@78B5000 { /* BLSP1 QUP0 */
@@ -1698,7 +1689,7 @@ 


		/* GPIO output to mss */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;

		linux,contiguous-region = <&modem_mem>;

		memory-region = <&modem_mem>;

	};



	jtag_fuse: jtagfuse@5e01c {