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

Commit 59f69e15 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: Remove wrong modem cpu cti for MSM8937" into msm-4.9

parents ae13b1a8 01e83bcd
Loading
Loading
Loading
Loading
+2 −15
Original line number Diff line number Diff line
@@ -973,26 +973,13 @@
		clock-names = "apb_pclk";
	};

	cti_modem_cpu0: cti@6128000 {
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x0003b966>;

		reg = <0x6128000 0x1000>;
		reg-names = "cti-base";
		coresight-name = "coresight-cti-modem-cpu0";

		clocks = <&clock_gcc clk_qdss_clk>,
			 <&clock_gcc clk_qdss_a_clk>;
		clock-names = "apb_pclk";
	};

	cti_modem_cpu1: cti@6124000{
	cti_modem_cpu0: cti@6124000{
		compatible = "arm,primecell";
		arm,primecell-periphid = <0x0003b966>;

		reg = <0x6124000 0x1000>;
		reg-names = "cti-base";
		coresight-name = "coresight-cti-modem-cpu1";
		coresight-name = "coresight-cti-modem-cpu0";

		clocks = <&clock_gcc clk_qdss_clk>,
			 <&clock_gcc clk_qdss_a_clk>;