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

Commit f1e1685a 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 phandles to ION heap nodes for msm8226"

parents 60e53dd1 f020dd50

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

+7 −7
Original line number Diff line number Diff line
@@ -16,17 +16,17 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		qcom,ion-heap@25 {

		system_heap: qcom,ion-heap@25 {

			reg = <25>;

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

		};



		qcom,ion-heap@21 {

		system_contig_heap: qcom,ion-heap@21 {

			reg = <21>;

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

		};



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

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

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

			reg = <8>;

			qcom,heap-align = <0x1000>;
@@ -35,7 +35,7 @@ 
			qcom,default-prefetch-size = <0x3c00000>;

		};



		qcom,ion-heap@22 { /* adsp heap */

		adsp_heap: qcom,ion-heap@22 { /* adsp heap */

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

			reg = <22>;

			qcom,heap-align = <0x1000>;
@@ -43,21 +43,21 @@ 
			qcom,ion-heap-type = "DMA";

		};



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

		qsecom_heap: qcom,ion-heap@27 { /* QSECOM HEAP */

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

			reg = <27>;

			linux,contiguous-region = <&qsecom_mem>;

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

		};



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

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

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

			reg = <28>;

			linux,contiguous-region = <&audio_mem>;

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

		};



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

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

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

			reg = <23>;

			linux,contiguous-region = <&adsp_venus_mem>;