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

Commit 64f6894f 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 memory map for modem resize to 85MB"

parents 13b985dc cc001c2f
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -86,19 +86,19 @@
		modem_mem: modem_region@0 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x86800000 0x0 0x5000000>;
			reg = <0x0 0x86800000 0x0 0x5500000>;
		};

		adsp_fw_mem: adsp_fw_region@0 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x8b800000 0x0 0x1100000>;
			reg = <0x0 0x8bd00000 0x0 0x1100000>;
		};

		wcnss_fw_mem: wcnss_fw_region@0 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x0 0x8c900000 0x0 0x700000>;
			reg = <0x0 0x8ce00000 0x0 0x700000>;
		};

		venus_mem: venus_region@0 {
+12 −0
Original line number Diff line number Diff line
@@ -238,6 +238,18 @@
	};
};

&modem_mem {
	reg = <0x0 0x86800000 0x0 0x5500000>;
};

&adsp_fw_mem {
	reg = <0x0 0x8bd00000 0x0 0x1100000>;
};

&wcnss_fw_mem {
	reg = <0x0 0x8ce00000 0x0 0x700000>;
};

&soc {
	pil_gpu: qcom,kgsl-hyp {
		compatible = "qcom,pil-tz-generic";