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

Commit f5e620ea 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 qseecom node for MDM9206"

parents 29d969ad 096cb686
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -26,3 +26,20 @@
&modem_adsp_mem {
	reg = <0x82a00000 0x2a00000>;
};

&cnss_debug_mem {
	status = "disabled";
};

&qcom_seecom {
	reg = <0x87900000 0x280000>;
	status = "okay";
};

&external_image_mem {
	reg = <0x87900000 0x700000>;
};

&qseecom_mem {
	status = "okay";
};
+11 −3
Original line number Diff line number Diff line
@@ -39,10 +39,16 @@
			reg = <0x82a00000 0x5000000>;
		};

		cnss_debug_mem: cnss_debug_region@0 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x87a00000 0x200000>;
		};

		external_image_mem: external_image_region@0 {
			compatible = "removed-dma-pool";
			no-map;
			reg = <0x87a00000 0x600000>;
			reg = <0x87c00000 0x400000>;
		};

		audio_mem: audio_region@0 {
@@ -55,8 +61,9 @@
		qseecom_mem: qseecom_region@0 {
			compatible = "shared-dma-pool";
			reusable;
			alignment = <0 0x400000>;
			size = <0 0x0400000>;
			alignment = <0x400000>;
			size = <0x0400000>;
			status = "disabled";
		};
	};

@@ -1595,6 +1602,7 @@
		clock-names = "core_clk_src", "core_clk",
				"iface_clk", "bus_clk";
		qcom,ce-opp-freq = <100000000>;
		status = "disabled";
	};

	emac0: qcom,emac@7c40000 {