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

Commit 703eeecd 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: Update the memory map for 8996"

parents 4281736a 5bcdece3
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@
			reg = <0 0x85800000 0 0x3000000>;
		};

		peripheral_mem: peripheral_region@8e000000 {
		peripheral_mem: peripheral_region@8ea00000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x8e400000 0 0x2b00000>;
			reg = <0 0x8ea00000 0 0x2b00000>;
		};

		qseecom_mem: qseecom_region {
@@ -185,10 +185,11 @@
			alignment = <0 0x200000>;
			size = <0 0x5c00000>;
		};

		modem_mem: modem_region@88800000 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0 0x88800000 0 0x5c00000>;
			reg = <0 0x88800000 0 0x6200000>;
		};

		dfps_data_mem: dfps_data_mem@82400000 {