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

Commit e4a4d8bb 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: enable qseecom/tzlog drivers and qseecom heap in mdm9607"

parents a06c3986 1f52d2ac

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

+5 −5
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
			reusable;

			alignment = <0x400000>;

			size = <0x0400000>;

			status = "disabled";

			status = "ok";

		};

	};
@@ -1714,9 +1714,9 @@ 
		qcom,ce-opp-freq = <100000000>;

	};



	qcom_seecom: qseecom@87a80000 {

	qcom_seecom: qseecom@88000000{

		compatible = "qcom,qseecom";

		reg = <0x87a80000 0x100000>;

		reg = <0x88000000 0x500000>;

		reg-names = "secapp-region";

		qcom,hlos-ce-hw-instance = <0>;

		qcom,qsee-ce-hw-instance = <0>;
@@ -1735,13 +1735,13 @@ 
		clock-names = "core_clk_src", "core_clk",

				"iface_clk", "bus_clk";

		qcom,ce-opp-freq = <100000000>;

		status = "disabled";

		status = "ok";

	};



	qcom_tzlog: tz-log@8600720 {

		compatible = "qcom,tz-log";

		reg = <0x08600720 0x2000>;

		status = "disabled";

		status = "ok";

	};



	emac0: qcom,emac@7c40000 {