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

Commit c650816c 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 tpiu/nidnt component dt entry for msm8937"

parents 4f98f918 1c986163
Loading
Loading
Loading
Loading
+109 −54
Original line number Diff line number Diff line
@@ -33,17 +33,72 @@
		clock-names = "core_clk", "core_a_clk";
	};

	tpiu: tpiu@6020000 {
		compatible = "arm,coresight-tpiu";
		reg = <0x6020000 0x1000>,
		      <0x1100000 0xb0000>;
		reg-names = "tpiu-base", "nidnt-base";

		coresight-id = <1>;
		coresight-name = "coresight-tpiu";
		coresight-nr-inports = <1>;

		pinctrl-names = "sdcard", "trace", "swduart",
				"swdtrc", "jtag", "spmi";
		/* NIDnT */
		pinctrl-0 = <&qdsd_clk_sdcard &qdsd_cmd_sdcard
			     &qdsd_data0_sdcard &qdsd_data1_sdcard
			     &qdsd_data2_sdcard &qdsd_data3_sdcard>;
		pinctrl-1 = <&qdsd_clk_trace &qdsd_cmd_trace
			     &qdsd_data0_trace &qdsd_data1_trace
			     &qdsd_data2_trace &qdsd_data3_trace>;
		pinctrl-2 = <&qdsd_cmd_swduart &qdsd_data0_swduart
			     &qdsd_data1_swduart &qdsd_data2_swduart
			     &qdsd_data3_swduart>;
		pinctrl-3 = <&qdsd_clk_swdtrc &qdsd_cmd_swdtrc
			     &qdsd_data0_swdtrc &qdsd_data1_swdtrc
			     &qdsd_data2_swdtrc &qdsd_data3_swdtrc>;
		pinctrl-4 = <&qdsd_cmd_jtag &qdsd_data0_jtag
			     &qdsd_data1_jtag &qdsd_data2_jtag
			     &qdsd_data3_jtag>;
		pinctrl-5 = <&qdsd_clk_spmi &qdsd_cmd_spmi
			     &qdsd_data0_spmi &qdsd_data3_spmi>;

		qcom,nidnthw;
		qcom,nidnt-swduart;
		qcom,nidnt-swdtrc;
		qcom,nidnt-jtag;
		qcom,nidnt-spmi;
		nidnt-gpio = <67>;
		nidnt-gpio-polarity = <1>;

		interrupts = <0 82 0>;
		interrupt-names = "nidnt-irq";

		vdd-supply = <&pm8937_l11>;
		qcom,vdd-voltage-level = <2950000 2950000>;
		qcom,vdd-current-level = <15000 400000>;

		vdd-io-supply = <&pm8937_l12>;
		qcom,vdd-io-voltage-level = <2950000 2950000>;
		qcom,vdd-io-current-level = <200 50000>;

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

	replicator: replicator@6026000 {
		compatible = "qcom,coresight-replicator";
		reg = <0x6026000 0x1000>;
		reg-names = "replicator-base";

		coresight-id = <1>;
		coresight-id = <2>;
		coresight-name = "coresight-replicator";
		coresight-nr-inports = <1>;
		coresight-outports = <0>;
		coresight-child-list = <&tmc_etr>;
		coresight-child-ports = <0>;
		coresight-outports = <0 1>;
		coresight-child-list = <&tmc_etr &tpiu>;
		coresight-child-ports = <0 0>;

		clocks = <&clock_gcc clk_qdss_clk>,
			 <&clock_gcc clk_qdss_a_clk>;
@@ -55,7 +110,7 @@
		reg = <0x6027000 0x1000>;
		reg-names = "tmc-base";

		coresight-id = <2>;
		coresight-id = <3>;
		coresight-name = "coresight-tmc-etf";
		coresight-nr-inports = <1>;
		coresight-outports = <0>;
@@ -74,7 +129,7 @@
		reg = <0x6021000 0x1000>;
		reg-names = "funnel-base";

		coresight-id = <3>;
		coresight-id = <4>;
		coresight-name = "coresight-funnel-in0";
		coresight-nr-inports = <8>;
		coresight-outports = <0>;
@@ -91,7 +146,7 @@
		reg = <0x6130000 0x1000>;
		reg-names = "funnel-base";

		coresight-id = <4>;
		coresight-id = <5>;
		coresight-name = "coresight-funnel-mm";
		coresight-nr-inports = <8>;
		coresight-outports = <0>;
@@ -108,7 +163,7 @@
		reg = <0x6100000 0x1000>;
		reg-names = "funnel-base";

		coresight-id = <5>;
		coresight-id = <6>;
		coresight-name = "coresight-funnel-center";
		coresight-nr-inports = <8>;
		coresight-outports = <0>;
@@ -125,7 +180,7 @@
		reg = <0x6120000 0x1000>;
		reg-names = "funnel-base";

		coresight-id = <6>;
		coresight-id = <7>;
		coresight-name = "coresight-funnel-right";
		coresight-nr-inports = <8>;
		coresight-outports = <0>;
@@ -142,7 +197,7 @@
		reg = <0x6132000 0x1000>;
		reg-names = "funnel-base";

		coresight-id = <7>;
		coresight-id = <8>;
		coresight-name = "coresight-funnel-cam";
		coresight-nr-inports = <8>;
		coresight-outports = <0>;
@@ -159,7 +214,7 @@
		reg = <0x61a1000 0x1000>;
		reg-names = "funnel-base";

		coresight-id = <8>;
		coresight-id = <9>;
		coresight-name = "coresight-funnel-apss";
		coresight-nr-inports = <8>;
		coresight-outports = <0>;
@@ -176,7 +231,7 @@
		reg = <0x61bc000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <9>;
		coresight-id = <10>;
		coresight-name = "coresight-etm0";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -194,7 +249,7 @@
		reg = <0x61bd000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <10>;
		coresight-id = <11>;
		coresight-name = "coresight-etm1";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -212,7 +267,7 @@
		reg = <0x61be000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <11>;
		coresight-id = <12>;
		coresight-name = "coresight-etm2";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -230,7 +285,7 @@
		reg = <0x61bf000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <12>;
		coresight-id = <13>;
		coresight-name = "coresight-etm3";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -248,7 +303,7 @@
		reg = <0x619c000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <13>;
		coresight-id = <14>;
		coresight-name = "coresight-etm4";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -266,7 +321,7 @@
		reg = <0x619d000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <14>;
		coresight-id = <15>;
		coresight-name = "coresight-etm5";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -284,7 +339,7 @@
		reg = <0x619e000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <15>;
		coresight-id = <16>;
		coresight-name = "coresight-etm6";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -302,7 +357,7 @@
		reg = <0x619f000 0x1000>;
		reg-names = "etm-base";

		coresight-id = <16>;
		coresight-id = <17>;
		coresight-name = "coresight-etm7";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -321,7 +376,7 @@
		      <0x9280000 0x180000>;
		reg-names = "stm-base", "stm-data-base";

		coresight-id = <17>;
		coresight-id = <18>;
		coresight-name = "coresight-stm";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -338,7 +393,7 @@
		reg = <0x6010000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <18>;
		coresight-id = <19>;
		coresight-name = "coresight-cti0";
		coresight-nr-inports = <0>;

@@ -352,7 +407,7 @@
		reg = <0x6011000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <19>;
		coresight-id = <20>;
		coresight-name = "coresight-cti1";
		coresight-nr-inports = <0>;

@@ -366,7 +421,7 @@
		reg = <0x6012000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <20>;
		coresight-id = <21>;
		coresight-name = "coresight-cti2";
		coresight-nr-inports = <0>;

@@ -380,7 +435,7 @@
		reg = <0x6013000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <21>;
		coresight-id = <22>;
		coresight-name = "coresight-cti3";
		coresight-nr-inports = <0>;

@@ -394,7 +449,7 @@
		reg = <0x6014000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <22>;
		coresight-id = <23>;
		coresight-name = "coresight-cti4";
		coresight-nr-inports = <0>;

@@ -408,7 +463,7 @@
		reg = <0x6015000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <23>;
		coresight-id = <24>;
		coresight-name = "coresight-cti5";
		coresight-nr-inports = <0>;

@@ -422,7 +477,7 @@
		reg = <0x6016000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <24>;
		coresight-id = <25>;
		coresight-name = "coresight-cti6";
		coresight-nr-inports = <0>;

@@ -436,7 +491,7 @@
		reg = <0x6017000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <25>;
		coresight-id = <26>;
		coresight-name = "coresight-cti7";
		coresight-nr-inports = <0>;

@@ -450,7 +505,7 @@
		reg = <0x6018000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <26>;
		coresight-id = <27>;
		coresight-name = "coresight-cti8";
		coresight-nr-inports = <0>;

@@ -464,7 +519,7 @@
		reg = <0x6019000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <27>;
		coresight-id = <28>;
		coresight-name = "coresight-cti9";
		coresight-nr-inports = <0>;

@@ -478,7 +533,7 @@
		reg = <0x601a000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <28>;
		coresight-id = <29>;
		coresight-name = "coresight-cti10";
		coresight-nr-inports = <0>;

@@ -492,7 +547,7 @@
		reg = <0x601b000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <29>;
		coresight-id = <30>;
		coresight-name = "coresight-cti11";
		coresight-nr-inports = <0>;

@@ -506,7 +561,7 @@
		reg = <0x601c000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <30>;
		coresight-id = <31>;
		coresight-name = "coresight-cti12";
		coresight-nr-inports = <0>;

@@ -520,7 +575,7 @@
		reg = <0x601d000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <31>;
		coresight-id = <32>;
		coresight-name = "coresight-cti13";
		coresight-nr-inports = <0>;

@@ -534,7 +589,7 @@
		reg = <0x601e000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <32>;
		coresight-id = <33>;
		coresight-name = "coresight-cti14";
		coresight-nr-inports = <0>;

@@ -548,7 +603,7 @@
		reg = <0x601f000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <33>;
		coresight-id = <34>;
		coresight-name = "coresight-cti15";
		coresight-nr-inports = <0>;

@@ -562,7 +617,7 @@
		reg = <0x61b8000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <34>;
		coresight-id = <35>;
		coresight-name = "coresight-cti-cpu0";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU4>;
@@ -577,7 +632,7 @@
		reg = <0x61b9000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <35>;
		coresight-id = <36>;
		coresight-name = "coresight-cti-cpu1";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU5>;
@@ -592,7 +647,7 @@
		reg = <0x61ba000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <36>;
		coresight-id = <37>;
		coresight-name = "coresight-cti-cpu2";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU6>;
@@ -607,7 +662,7 @@
		reg = <0x61bb000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <37>;
		coresight-id = <38>;
		coresight-name = "coresight-cti-cpu3";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU7>;
@@ -622,7 +677,7 @@
		reg = <0x6198000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <38>;
		coresight-id = <39>;
		coresight-name = "coresight-cti-cpu4";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU0>;
@@ -637,7 +692,7 @@
		reg = <0x6199000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <39>;
		coresight-id = <40>;
		coresight-name = "coresight-cti-cpu5";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU1>;
@@ -652,7 +707,7 @@
		reg = <0x619a000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <40>;
		coresight-id = <41>;
		coresight-name = "coresight-cti-cpu6";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU2>;
@@ -667,7 +722,7 @@
		reg = <0x619b000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <41>;
		coresight-id = <42>;
		coresight-name = "coresight-cti-cpu7";
		coresight-nr-inports = <0>;
		coresight-cti-cpu = <&CPU3>;
@@ -682,7 +737,7 @@
		reg = <0x6124000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <42>;
		coresight-id = <43>;
		coresight-name = "coresight-cti-modem-cpu0";
		coresight-nr-inports = <0>;

@@ -697,7 +752,7 @@
		reg = <0x6139000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <43>;
		coresight-id = <44>;
		coresight-name = "coresight-cti-wcn-cpu0";
		coresight-nr-inports = <0>;

@@ -712,7 +767,7 @@
		reg = <0x6134000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <44>;
		coresight-id = <45>;
		coresight-name = "coresight-cti-video-cpu0";
		coresight-nr-inports = <0>;

@@ -727,7 +782,7 @@
		reg = <0x613c000 0x1000>;
		reg-names = "cti-base";

		coresight-id = <45>;
		coresight-id = <46>;
		coresight-name = "coresight-cti-audio-cpu0";
		coresight-nr-inports = <0>;

@@ -740,7 +795,7 @@
	wcn_etm0 {
		compatible = "qcom,coresight-remote-etm";

		coresight-id = <46>;
		coresight-id = <47>;
		coresight-name = "coresight-wcn-etm0";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -753,7 +808,7 @@
	rpm_etm0 {
		compatible = "qcom,coresight-remote-etm";

		coresight-id = <47>;
		coresight-id = <48>;
		coresight-name = "coresight-rpm-etm0";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -767,7 +822,7 @@
	audio_etm0 {
		compatible = "qcom,coresight-remote-etm";

		coresight-id = <48>;
		coresight-id = <49>;
		coresight-name = "coresight-audio-etm0";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -780,7 +835,7 @@
	modem_etm0 {
		compatible = "qcom,coresight-remote-etm";

		coresight-id = <49>;
		coresight-id = <50>;
		coresight-name = "coresight-modem-etm0";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
@@ -795,7 +850,7 @@
		reg = <0x6001000 0x1000>;
		reg-names = "csr-base";

		coresight-id = <50>;
		coresight-id = <51>;
		coresight-name = "coresight-csr";
		coresight-nr-inports = <0>;
		qcom,blk-size = <1>;
@@ -810,7 +865,7 @@
		reg = <0x6108000 0x1000>;
		reg-names = "dbgui-base";

		coresight-id = <51>;
		coresight-id = <52>;
		coresight-name = "coresight-dbgui";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
+243 −0
Original line number Diff line number Diff line
@@ -446,6 +446,249 @@
			};
		};

		pmx_qdsd_clk {
			qdsd_clk_sdcard: clk_sdcard {
				config {
					pins = "qdsd_clk";
					bias-disable; /* NO pull */
					drive-strength = <16>; /* 16 MA */
				};
			};
			qdsd_clk_trace: clk_trace {
				config {
					pins = "qdsd_clk";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_clk_swdtrc: clk_swdtrc {
				config {
					pins = "qdsd_clk";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_clk_spmi: clk_spmi {
				config {
					pins = "qdsd_clk";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
		};

		pmx_qdsd_cmd {
			qdsd_cmd_sdcard: cmd_sdcard {
				config {
					pins = "qdsd_cmd";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_cmd_trace: cmd_trace {
				config {
					pins = "qdsd_cmd";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_cmd_swduart: cmd_uart {
				config {
					pins = "qdsd_cmd";
					bias-pull-up; /* pull up */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_cmd_swdtrc: cmd_swdtrc {
				config {
					pins = "qdsd_cmd";
					bias-pull-up; /* pull up */
					drive-strength = <2>; /* 2 MA */
				};
			};

			qdsd_cmd_jtag: cmd_jtag {
				config {
					pins = "qdsd_cmd";
					bias-disable; /* NO pull */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_cmd_spmi: cmd_spmi {
				config {
					pins = "qdsd_cmd";
					bias-pull-down; /* pull down */
					drive-strength = <10>; /* 10 MA */
				};
			};
		};

		pmx_qdsd_data0 {
			qdsd_data0_sdcard: data0_sdcard {
				config {
					pins = "qdsd_data0";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data0_trace: data0_trace {
				config {
					pins = "qdsd_data0";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data0_swduart: data0_uart {
				config {
					pins = "qdsd_data0";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data0_swdtrc: data0_swdtrc {
				config {
					pins = "qdsd_data0";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data0_jtag: data0_jtag {
				config {
					pins = "qdsd_data0";
					bias-pull-up; /* pull up */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data0_spmi: data0_spmi {
				config {
					pins = "qdsd_data0";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
		};

		pmx_qdsd_data1 {
			qdsd_data1_sdcard: data1_sdcard {
				config {
					pins = "qdsd_data1";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data1_trace: data1_trace {
				config {
					pins = "qdsd_data1";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data1_swduart: data1_uart {
				config {
					pins = "qdsd_data1";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data1_swdtrc: data1_swdtrc {
				config {
					pins = "qdsd_data1";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data1_jtag: data1_jtag {
				config {
					pins = "qdsd_data1";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
		};

		pmx_qdsd_data2 {
			qdsd_data2_sdcard: data2_sdcard {
				config {
					pins = "qdsd_data2";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data2_trace: data2_trace {
				config {
					pins = "qdsd_data2";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data2_swduart: data2_uart {
				config {
					pins = "qdsd_data2";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data2_swdtrc: data2_swdtrc {
				config {
					pins = "qdsd_data2";
					bias-pull-down; /* pull down */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data2_jtag: data2_jtag {
				config {
					pins = "qdsd_data2";
					bias-pull-up; /* pull up */
					drive-strength = <8>; /* 8 MA */
				};
			};
		};

		pmx_qdsd_data3 {
			qdsd_data3_sdcard: data3_sdcard {
				config {
					pins = "qdsd_data3";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data3_trace: data3_trace {
				config {
					pins = "qdsd_data3";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
			qdsd_data3_swduart: data3_uart {
				config {
					pins = "qdsd_data3";
					bias-pull-up; /* pull up */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data3_swdtrc: data3_swdtrc {
				config {
					pins = "qdsd_data3";
					bias-pull-up; /* pull up */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data3_jtag: data3_jtag {
				config {
					pins = "qdsd_data3";
					bias-pull-up; /* pull up */
					drive-strength = <2>; /* 2 MA */
				};
			};
			qdsd_data3_spmi: data3_spmi {
				config {
					pins = "qdsd_data3";
					bias-pull-down; /* pull down */
					drive-strength = <8>; /* 8 MA */
				};
			};
		};

		pmx_sdc1_rclk {
			sdc1_rclk_on: sdc1_rclk_on {
				config {