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

Commit 043dd817 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 entry for relocatable pil heaps"

parents c655c31f 043f10e2

arch/arm/boot/dts/msmsamarium-ion.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -27,5 +27,19 @@ 
		qcom,ion-heap@25 { /* IOMMU HEAP */

			reg = <25>;

		};



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

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

			reg = <23>;

			qcom,heap-align = <0x1000>;

			qcom,memory-fixed = <0x05900000 0x2200000>;

		};



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

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

			reg = <26>;

			qcom,heap-align = <0x1000>;

			qcom,memory-fixed = <0x08000000 0x5100000>;

		};

	};

};

arch/arm/boot/dts/msmsamarium.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ 


	qcom,msm-mem-hole {

		compatible = "qcom,msm-mem-hole";

		qcom,memblock-remove = <0x07f00000 0x8000000>; /* Address and size of hole */

		qcom,memblock-remove = <0x05900000 0x7800000

					0x0fa00000 0x500000>; /* Address and size of hole */

	};



	qcom,ipc-spinlock@fd484000 {