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

Commit c2e3a1a7 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: memory rework for gvm on msm8996"

parents b598eeb6 70830b4c

arch/arm/boot/dts/qcom/vplatform-lfv-ion.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -27,11 +27,5 @@ 
			memory-region = <&qseecom_mem>;

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

		};



		qcom,ion-heap@28 { /* Audio Heap */

			reg = <28>;

			memory-region = <&ion_audio>;

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

		};

	};

};

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-ivi.dts

+12 −0
Original line number Diff line number Diff line
@@ -41,3 +41,15 @@ 
&blsp1_uart2 {

	status = "okay";

};



&reserved_memory {

		pmem_shared: pmem_shared_region@d0000000 {

			reg = <0 0xd0000000 0 0x20000000>;

			label = "pmem_shared_mem";

		};



		ion_system: ion_system_region@100000000 {

			reg = <0x1 0x0 0 0x10000000>;

			label = "ion_system_mem";

		};

};

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-telematics.dts

+7 −0
Original line number Diff line number Diff line
@@ -34,11 +34,13 @@ 
		no-map;

		reg = <0 0x88800000 0 0x6200000>;

	};



	peripheral_mem: peripheral_region@8ea00000 {

		compatible = "removed-dma-pool";

		no-map;

		reg = <0 0x8ea00000 0 0x2b00000>;

	};



	adsp_mem: adsp_region {

		compatible = "shared-dma-pool";

		alloc-ranges = <0 0x00000000 0 0xffffffff>;
@@ -46,6 +48,11 @@ 
		alignment = <0 0x100000>;

		size = <0 0x400000>;

	};



	ion_system: ion_system_region@ff000000 {

		reg = <0 0xff000000 0 0x00400000>;

		label = "ion_system_mem";

	};

};



&soc {

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -35,14 +35,6 @@ 
		#size-cells = <2>;

		ranges;



		pmem_shared: pmem_shared_region {

			reg = <0 0xd0000000 0 0x20000000>;

			label = "pmem_shared_mem";

		};

		ion_system: ion_system_region {

			reg = <0x1 0x0 0 0x10000000>;

			label = "ion_system_mem";

		};

		qseecom_mem: qseecom_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0 0x00000000 0 0xffffffff>;
@@ -50,10 +42,6 @@ 
			alignment = <0 0x400000>;

			size = <0 0x1400000>;

		};

		ion_audio: ion_audio_region {

			reg = <0 0xc8000000 0 0x00400000>;

			label = "ion_audio_mem";

		};

	};

};