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

Commit affbf61d 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 ION heaps for mpq8092"

parents 1e9ff503 ef031a48

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

+22 −0
Original line number Diff line number Diff line
@@ -33,6 +33,28 @@ 
			qcom,memory-fixed = <0x0d000000 0x2800000>;

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

		};



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

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

			reg = <27>;

			linux,contiguous-region = <&qseecom_mem>;

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

		};



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

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

			reg = <8>;

			qcom,heap-align = <0x1000>;

			linux,contiguous-region = <&secure_mem>;

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

		};



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

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

			reg = <28>;

			linux,contiguous-region = <&audio_mem>;

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

		};

	};

};

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

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,18 @@ 
			reg = <0 0x614000>;

			label = "audio_mem";

		};



		qseecom_mem: qseecom_region@0 {

			linux,contiguous-region;

			reg = <0 0x1100000>;

			label = "qseecom_mem";

                };



		secure_mem: secure_region@0 {

			linux,contiguous-region;

			reg = <0 0xfc00000>;

			label = "secure_mem";

		};

	};



	soc: soc { };