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

Commit b866cabf authored by Abhimanyu Kapur's avatar Abhimanyu Kapur Committed by Matt Wagantall
Browse files

ARM: dts: update memory cma reservations for mdm9640 



Update the memory reservations for audio heap and modem
pil regions by using the upstream kernel reservation
device tree compatible strings.

Change-Id: I4b4f139795f31b7296275b7a2bee53e1bf852a11
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent 5a249fd0

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

+4 −5
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ 
		};



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

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

		reg = <28>;

			linux,contiguous-region = <&audio_mem>;

		memory-region = <&audio_mem>;

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

		};

	};

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

+14 −14
Original line number Diff line number Diff line
@@ -34,28 +34,29 @@ 
		sdhc1 = &sdhc_1; /* SDC1 eMMC/SD slot */

	};



	memory {

	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		peripheral1_mem: peripheral1_region@0x81c00000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			compatible = "removed-dma-pool";

			reg = <0x81C00000 0x5F00000>;

			no-map;

			label = "peripheral1_mem";

		};



		peripheral2_mem: peripheral2_region@0x87d00000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x87d00000 0x300000>;

			label = "peripheral2_mem";

		};



		audio_mem: audio_region@0 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			reg = <0 0xAF000>;

			label = "audio_mem";

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x400000>;

		 };

	};
@@ -1441,8 +1442,7 @@ 


		/* GPIO output to mss */

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



		linux,contiguous-region = <&peripheral1_mem>;

		memory-region = <&peripheral1_mem>;

	};



	qcom,cnss {