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

Commit d804a0d4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Correct name of funnel merg on holi"

parents a2682197 2c77fff6

qcom/holi-coresight.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1906,13 +1906,13 @@ 
		};

	};



	funnel_merge: funnel@8045000 {

	funnel_merg: funnel@8045000 {

		compatible = "arm,primecell";

		arm,primecell-periphid = <0x000bb908>;

		reg = <0x08045000 0x1000>;

		reg-names = "funnel-base";



		coresight-name = "coresight-funnel-merge";

		coresight-name = "coresight-funnel-merg";



		clocks = <&rpmcc RPM_SMD_QDSS_CLK>;

		clock-names = "apb_pclk";