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

Commit 29f962e1 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: Move audio heaps over to use reserved CMA regions"

parents 858d81f4 545e7324

arch/arm/boot/dts/qti/msm8226-ion.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -52,10 +52,8 @@ 
		qcom,ion-heap@28 { /* AUDIO HEAP */

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

			reg = <28>;

			qcom,heap-align = <0x1000>;

			qcom,memory-reservation-type = "EBI1"; /* reserve EBI memory */

			qcom,memory-reservation-size = <0x314000>;

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

			linux,contiguous-region = <&audio_mem>;

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

		};



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

arch/arm/boot/dts/qti/msm8226.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -49,6 +49,12 @@ 
			label = "fb_mem";

		};



		audio_mem: audio_region {

			linux,contiguous-region;

			linux,reserve-region;

			reg = <0 0x314000>;

			label = "audio_mem";

		};

	};



	soc: soc { };

arch/arm/boot/dts/qti/msm8974-ion.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -52,10 +52,8 @@ 
		qcom,ion-heap@28 { /* AUDIO HEAP */

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

			reg = <28>;

			qcom,heap-align = <0x1000>;

			qcom,memory-reservation-type = "EBI1"; /* reserve EBI memory */

			qcom,memory-reservation-size = <0x614000>;

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

			linux,contiguous-region = <&audio_mem>;

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

		};



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

arch/arm/boot/dts/qti/msm8974.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -94,6 +94,12 @@ 
			label = "fb_mem";

		};



		audio_mem: audio_region {

			linux,contiguous-region;

			linux,reserve-region;

			reg = <0 0x614000>;

			lable = "audio_mem";

		};

	};



	soc: soc { };