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

Commit ade81027 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: Change node for memory hole for 8092"

parents 01199215 fea050ad

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
			compatible = "qcom,msm-ion-reserve";

			reg = <23>;

			qcom,heap-align = <0x1000>;

			qcom,memory-fixed = <0x0db00000 0x1d00000>;

			qcom,memory-fixed = <0x0d000000 0x2800000>;

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

		};

	};

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

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


	memory_hole: qcom,msm-mem-hole {

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

		qcom,memblock-remove = <0x0d400000 0x02400000

					0x0FA00000 0x00600000>;

		qcom,memblock-remove = <0x0c800000 0x03600000>;

	};



	qcom,ipc-spinlock@fd484000 {