ARM: dts: msm: Update SDM660 memdump table, coresight ids

Add missing memdump table entries for SDM660 as compared
to 4.9 kernel and update all the coresight periphids to
match the 4.19 driver. These changes are required for the
extraction of traces from dumps.

Change-Id: I09b79ddd494ba484993b96596d1a32978a30fc06

2 files changed, 142 insertions, 47 deletions

diff --git a/qcom/sdm660-coresight.dtsi b/qcom/sdm660-coresight.dtsi
index 041e8a4d..9ce746a0 100644
--- a/qcom/sdm660-coresight.dtsi
+++ b/qcom/sdm660-coresight.dtsi
@@ -17,7 +17,7 @@
 
 	tmc_etr: tmc@6048000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b961>;
+		arm,primecell-periphid = <0x000bb961>;
 
 		reg = <0x6048000 0x1000>,
 		      <0x6064000 0x15000>;
@@ -46,7 +46,7 @@
 
 	replicator_qdss: replicator@6046000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b909>;
+		arm,primecell-periphid = <0x000bb909>;
 
 		reg = <0x6046000 0x1000>;
 		reg-names = "replicator-base";
@@ -81,7 +81,7 @@
 
 	tmc_etf: tmc@6047000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b961>;
+		arm,primecell-periphid = <0x000bb961>;
 
 		reg = <0x6047000 0x1000>;
 		reg-names = "tmc-base";
@@ -120,7 +120,7 @@
 
 	funnel_merg: funnel@6045000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b908>;
+		arm,primecell-periphid = <0x000bb908>;
 
 		reg = <0x6045000 0x1000>;
 		reg-names = "funnel-base";
@@ -163,7 +163,7 @@
 
 	funnel_in0: funnel@6041000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b908>;
+		arm,primecell-periphid = <0x000bb908>;
 
 		reg = <0x6041000 0x1000>;
 		reg-names = "funnel-base";
@@ -213,7 +213,7 @@
 
 	funnel_in1: funnel@6042000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b908>;
+		arm,primecell-periphid = <0x000bb908>;
 
 		reg = <0x6042000 0x1000>;
 		reg-names = "funnel-base";
@@ -272,7 +272,7 @@
 
 	funnel_apss_merg: funnel@7b70000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b908>;
+		arm,primecell-periphid = <0x000bb908>;
 
 		reg = <0x7b70000 0x1000>;
 		reg-names = "funnel-base";
@@ -323,7 +323,7 @@
 
 	funnel_apss: funnel@7b60000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b908>;
+		arm,primecell-periphid = <0x000bb908>;
 
 		reg = <0x7b60000 0x1000>;
 		reg-names = "funnel-base";
@@ -414,7 +414,7 @@
 
 	stm: stm@6002000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b962>;
+		arm,primecell-periphid = <0x000bb962>;
 
 		reg = <0x6002000 0x1000>,
 		      <0x16280000 0x180000>;
@@ -596,7 +596,7 @@
 	cti0: cti@6010000 {
 		compatible = "arm,primecell";
 		reg = <0x6010000 0x1000>;
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg-names = "cti-base";
 
 		coresight-name = "coresight-cti0";
@@ -608,7 +608,7 @@
 
 	cti1: cti@6011000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6011000 0x1000>;
 		reg-names = "cti-base";
 
@@ -621,7 +621,7 @@
 
 	cti2: cti@6012000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6012000 0x1000>;
 		reg-names = "cti-base";
 
@@ -638,7 +638,7 @@
 
 	cti3: cti@6013000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6013000 0x1000>;
 		reg-names = "cti-base";
 
@@ -651,7 +651,7 @@
 
 	cti4: cti@6014000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6014000 0x1000>;
 		reg-names = "cti-base";
 
@@ -664,7 +664,7 @@
 
 	cti5: cti@6015000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6015000 0x1000>;
 		reg-names = "cti-base";
 
@@ -677,7 +677,7 @@
 
 	cti6: cti@6016000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6016000 0x1000>;
 		reg-names = "cti-base";
 
@@ -690,7 +690,7 @@
 
 	cti7: cti@6017000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6017000 0x1000>;
 		reg-names = "cti-base";
 
@@ -703,7 +703,7 @@
 
 	cti8: cti@6018000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6018000 0x1000>;
 		reg-names = "cti-base";
 
@@ -716,7 +716,7 @@
 
 	cti9: cti@6019000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x6019000 0x1000>;
 		reg-names = "cti-base";
 
@@ -729,7 +729,7 @@
 
 	cti10: cti@601a000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x601a000 0x1000>;
 		reg-names = "cti-base";
 
@@ -742,7 +742,7 @@
 
 	cti11: cti@601b000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x601b000 0x1000>;
 		reg-names = "cti-base";
 
@@ -755,7 +755,7 @@
 
 	cti12: cti@601c000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x601c000 0x1000>;
 		reg-names = "cti-base";
 
@@ -768,7 +768,7 @@
 
 	cti13: cti@601d000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x601d000 0x1000>;
 		reg-names = "cti-base";
 
@@ -781,7 +781,7 @@
 
 	cti14: cti@601e000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x601e000 0x1000>;
 		reg-names = "cti-base";
 
@@ -794,7 +794,7 @@
 
 	cti15: cti@601f000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x601f000 0x1000>;
 		reg-names = "cti-base";
 
@@ -807,7 +807,7 @@
 
 	cti_cpu0: cti@7820000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 
 		reg = <0x7820000 0x1000>;
 		reg-names = "cti-base";
@@ -822,7 +822,7 @@
 
 	cti_cpu1: cti@7920000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7920000 0x1000>;
 		reg-names = "cti-base";
 
@@ -836,7 +836,7 @@
 
 	cti_cpu2: cti@7a20000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7a20000 0x1000>;
 		reg-names = "cti-base";
 
@@ -850,7 +850,7 @@
 
 	cti_cpu3: cti@7b20000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7b20000 0x1000>;
 		reg-names = "cti-base";
 
@@ -864,7 +864,7 @@
 
 	cti_cpu4: cti@7c20000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7c20000 0x1000>;
 		reg-names = "cti-base";
 
@@ -878,7 +878,7 @@
 
 	cti_cpu5: cti@7d20000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7d20000 0x1000>;
 		reg-names = "cti-base";
 
@@ -892,7 +892,7 @@
 
 	cti_cpu6: cti@7e20000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7e20000 0x1000>;
 		reg-names = "cti-base";
 
@@ -906,7 +906,7 @@
 
 	cti_cpu7: cti@7f20000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7f20000 0x1000>;
 		reg-names = "cti-base";
 
@@ -920,7 +920,7 @@
 
 	cti_apss: cti@7b80000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7b80000 0x1000>;
 		reg-names = "cti-base";
 
@@ -933,7 +933,7 @@
 
 	cti_apss_dl: cti@7bc1000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7bc1000 0x1000>;
 		reg-names = "cti-base";
 
@@ -946,7 +946,7 @@
 
 	cti_olc: cti@7b91000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7b91000 0x1000>;
 		reg-names = "cti-base";
 
@@ -959,7 +959,7 @@
 
 	cti_turing: cti@7068000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7068000 0x1000>;
 		reg-names = "cti-base";
 
@@ -972,7 +972,7 @@
 
 	cti_wcss0: cti@71a4000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x71a4000 0x1000>;
 		reg-names = "cti-base";
 
@@ -986,7 +986,7 @@
 
 	cti_wcss1: cti@71a5000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x71a5000 0x1000>;
 		reg-names = "cti-base";
 
@@ -1000,7 +1000,7 @@
 
 	cti_wcss2: cti@71a6000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x71a6000 0x1000>;
 		reg-names = "cti-base";
 
@@ -1014,7 +1014,7 @@
 
 	cti_mmss: cti@7188000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7188000 0x1000>;
 		reg-names = "cti-base";
 
@@ -1027,7 +1027,7 @@
 
 	cti_isdb: cti@7121000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7121000 0x1000>;
 		reg-names = "cti-base";
 
@@ -1041,7 +1041,7 @@
 
 	cti_rpm: cti@7048000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7048000 0x1000>;
 		reg-names = "cti-base";
 
@@ -1054,7 +1054,7 @@
 
 	cti_mss: cti@7041000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b966>;
+		arm,primecell-periphid = <0x000bb966>;
 		reg = <0x7041000 0x1000>;
 		reg-names = "cti-base";
 
@@ -1067,7 +1067,7 @@
 
 	funnel_qatb: funnel@6005000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b908>;
+		arm,primecell-periphid = <0x000bb908>;
 
 		reg = <0x6005000 0x1000>;
 		reg-names = "funnel-base";
@@ -1525,7 +1525,7 @@
 
 	funnel_dlct: funnel@71c3000 {
 		compatible = "arm,primecell";
-		arm,primecell-periphid = <0x0003b908>;
+		arm,primecell-periphid = <0x000bb908>;
 
 		reg = <0x71c3000 0x1000>;
 		reg-names = "funnel-base";
diff --git a/qcom/sdm660.dtsi b/qcom/sdm660.dtsi
index ba1e2bde..7bfc1f8e 100644
--- a/qcom/sdm660.dtsi
+++ b/qcom/sdm660.dtsi
@@ -387,7 +387,7 @@
 			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
 			reusable;
 			alignment = <0x0 0x400000>;
-			size = <0x0 0x140000>;
+			size = <0x0 0x1a0000>;
 		};
 
 		venus_fw_mem: venus_fw_region {
@@ -543,6 +543,101 @@
 			compatible = "qcom,mem-dump";
 			memory-region = <&dump_mem>;
 
+			rpm_sw_dump {
+				qcom,dump-size = <0x28000>;
+				qcom,dump-id = <0xea>;
+			};
+
+			pmic_dump {
+				qcom,dump-size = <0x10000>;
+				qcom,dump-id = <0xe4>;
+			};
+
+			vsense_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xe9>;
+			};
+
+			tmc_etf_dump {
+				qcom,dump-size = <0x10000>;
+				qcom,dump-id = <0xf0>;
+			};
+
+			tmc_etr_reg_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x100>;
+			};
+
+			tmc_etf_reg_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x101>;
+			};
+
+			misc_data_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xe8>;
+			};
+
+			dcc_reg_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xe6>;
+			};
+
+			dcc_sram_dump {
+				qcom,dump-size = <0x2000>;
+				qcom,dump-id = <0xe7>;
+			};
+
+			log_buf_dump {
+				qcom,dump-size = <0x10000>;
+				qcom,dump-id = <0x110>;
+			};
+
+			log_buf_first_idx_dump {
+				qcom,dump-size = <0x0>;
+				qcom,dump-id = <0x111>;
+			};
+
+			etm_reg0_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa0>;
+			};
+
+			etm_reg1_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa1>;
+			};
+
+			etm_reg2_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa2>;
+			};
+
+			etm_reg3_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa3>;
+			};
+
+			etm_reg4_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa4>;
+			};
+
+			etm_reg5_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa5>;
+			};
+
+			etm_reg6_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa6>;
+			};
+
+			etm_reg7_dump {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xa7>;
+			};
+
 			c_scandump {
 				qcom,dump-size = <0x40000>;
 				qcom,dump-id = <0xeb>;