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

Commit 1a0a6c74 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 cpu cti for msmtitanium"

parents a665de5b a4459176

arch/arm/boot/dts/qcom/msmtitanium-coresight.dtsi

+142 −1
Original line number Diff line number Diff line
@@ -396,12 +396,132 @@ 
		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu0: cti@61b8000{

		compatible = "arm,coresight-cti";

		reg = <0x61b8000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <25>;

		coresight-name = "coresight-cti-cpu0";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU4>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu1: cti@61b9000{

		compatible = "arm,coresight-cti";

		reg = <0x61b9000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <26>;

		coresight-name = "coresight-cti-cpu1";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU5>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu2: cti@61ba000{

		compatible = "arm,coresight-cti";

		reg = <0x61ba000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <27>;

		coresight-name = "coresight-cti-cpu2";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU6>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu3: cti@61bb000{

		compatible = "arm,coresight-cti";

		reg = <0x61bb000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <28>;

		coresight-name = "coresight-cti-cpu3";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU7>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu4: cti@6198000{

		compatible = "arm,coresight-cti";

		reg = <0x6198000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <29>;

		coresight-name = "coresight-cti-cpu4";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU0>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu5: cti@6199000{

		compatible = "arm,coresight-cti";

		reg = <0x6199000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <30>;

		coresight-name = "coresight-cti-cpu5";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU1>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu6: cti@619a000{

		compatible = "arm,coresight-cti";

		reg = <0x619a000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <31>;

		coresight-name = "coresight-cti-cpu6";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU2>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	cti_cpu7: cti@619b000{

		compatible = "arm,coresight-cti";

		reg = <0x619b000 0x1000>;

		reg-names = "cti-base";



		coresight-id = <32>;

		coresight-name = "coresight-cti-cpu7";

		coresight-nr-inports = <0>;

		coresight-cti-cpu = <&CPU3>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	csr: csr@6001000 {

		compatible = "qcom,coresight-csr";

		reg = <0x6001000 0x1000>;

		reg-names = "csr-base";



		coresight-id = <25>;

		coresight-id = <33>;

		coresight-name = "coresight-csr";

		coresight-nr-inports = <0>;

		qcom,blk-size = <1>;
@@ -410,4 +530,25 @@ 
			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};



	dbgui: dbgui@6108000 {

		compatible = "qcom,coresight-dbgui";

		reg = <0x6108000 0x1000>;

		reg-names = "dbgui-base";



		coresight-id = <34>;

		coresight-name = "coresight-dbgui";

		coresight-nr-inports = <0>;

		coresight-outports = <0>;

		coresight-child-list = <&funnel_center>;

		coresight-child-ports = <2>;



		qcom,dbgui-addr-offset = <0x30>;

		qcom,dbgui-data-offset = <0x130>;

		qcom,dbgui-size = <64>;



		clocks = <&clock_gcc clk_qdss_clk>,

			 <&clock_gcc clk_qdss_a_clk>;

		clock-names = "core_clk", "core_a_clk";

	};

};

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

+29 −0
Original line number Diff line number Diff line
@@ -287,6 +287,35 @@ 
		};

	};



	qcom,wdt@b017000 {

		compatible = "qcom,msm-watchdog";

		reg = <0xb017000 0x1000>;

		reg-names = "wdt-base";

		interrupts = <0 3 0>, <0 4 0>;

		qcom,bark-time = <11000>;

		qcom,pet-time = <10000>;

		qcom,ipi-ping;

		status = "disabled";

	};



	qcom,msm-imem@8600000 {

		compatible = "qcom,msm-imem";

		reg = <0x08600000 0x1000>;

		ranges = <0x0 0x08600000 0x1000>;

		#address-cells = <1>;

		#size-cells = <1>;



		mem_dump_table@10 {

			compatible = "qcom,msm-imem-mem_dump_table";

			reg = <0x10 8>;

		};



		restart_reason@65c {

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};

	};



	qcom,smdtty {

		compatible = "qcom,smdtty";