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

Commit 1aaafc9b 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: Migrate 9630 memory regions to CMA"

parents c37fff03 fb9d9422

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

+16 −6
Original line number Diff line number Diff line
@@ -31,6 +31,22 @@ 
			reg = <0 0xAF000>;

			label = "audio_mem";

		};



		peripheral_mem: peripheral_region@0x100000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x1000000 0x5e00000>;

			label = "peripheral_mem";

		};



		sbl_mem: sbl_region@0x7f00000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x7f00000 0x100000>;

			label = "sbl_mem";

		};

	};



	soc: soc { };
@@ -107,12 +123,6 @@ 
		};

	};



	qcom,msm-mem-hole {

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

		qcom,memblock-remove = <0x01000000 0x05E00000

					0x07F00000 0x00100000>; /* Address and Size of Hole */

	};



	timer@f9020000 {

		#address-cells = <1>;

		#size-cells = <1>;