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

Commit 159b2849 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: Add modem heap and migrate 8916 memory regions to CMA"

parents 9c154cdd 3f47be1e

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

+9 −3
Original line number Diff line number Diff line
@@ -51,9 +51,15 @@ 
		qcom,ion-heap@23 { /* OTHER PIL HEAP */

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

			reg = <23>;

			qcom,heap-align = <0x1000>;

			qcom,memory-fixed = <0x8eb00000 0x0b00000>;

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

			linux,contiguous-region = <&peripheral_mem>;

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

		};



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

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

			reg = <26>;

			linux,contiguous-region = <&modem_adsp_mem>;

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

		};

	};

};

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

+20 −4
Original line number Diff line number Diff line
@@ -81,12 +81,28 @@ 
		#address-cells = <2>;

		#size-cells = <2>;



		removed_regions: removed_regions@0 {

		external_image_mem: external_image__region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0 0x88800000 0x0 0x06e00000>;

			label = "removed_regions";

			reg = <0x0 0x8e200000 0x0 0x0900000>;

			label = "external_image_mem";

		};



		modem_adsp_mem: modem_adsp_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0 0x88800000 0x0 0x05a00000>;

			label = "modem_adsp_mem";

		};



		peripheral_mem: pheripheral_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0 0x8eb00000 0x0 0x0b00000>;

			label = "peripheral_mem";

		};



		secure_mem: secure_region@0 {