diff --git a/qcom/kalama-debug.dtsi b/qcom/kalama-debug.dtsi
index 41840fd4..8578add4 100644
--- a/qcom/kalama-debug.dtsi
+++ b/qcom/kalama-debug.dtsi
@@ -70,78 +70,23 @@
 			qcom,dump-id = <0x7>;
 		};
 
-		complex0_scan {
-			qcom,dump-size = <0x4a100>;
-			qcom,dump-id = <0x130>;
-		};
-
-		complex1_scan {
-			qcom,dump-size = <0x4a100>;
-			qcom,dump-id = <0x131>;
-		};
-
-		gold0_scan {
-			qcom,dump-size = <0x5f700>;
-			qcom,dump-id = <0x132>;
-		};
-
-		gold1_scan {
-			qcom,dump-size = <0x5f700>;
-			qcom,dump-id = <0x133>;
-		};
-
-		gold2_scan {
-			qcom,dump-size = <0x5f700>;
-			qcom,dump-id = <0x134>;
-		};
-
-		gold3_scan {
-			qcom,dump-size = <0x81100>;
-			qcom,dump-id = <0x135>;
-		};
-
-		l3slice0scan {
-			qcom,dump-size = <0x4cd00>;
-			qcom,dump-id = <0x136>;
-		};
-
-		l3slice1scan {
-			qcom,dump-size = <0x14e00>;
-			qcom,dump-id = <0x137>;
-		};
-
-		l3slice2scan {
-			qcom,dump-size = <0x14e00>;
-			qcom,dump-id = <0x138>;
-		};
-
-		l3slice3scan {
-			qcom,dump-size = <0x14e00>;
-			qcom,dump-id = <0x139>;
-		};
-
-		mhm_scan {
-			qcom,dump-size = <0x5a700>;
-			qcom,dump-id = <0x161>;
-		};
-
 		l1_icache0 {
-			qcom,dump-size = <0x9100>;
+			qcom,dump-size = <0x11100>;
 			qcom,dump-id = <0x60>;
 		};
 
 		l1_icache100 {
-			qcom,dump-size = <0x9100>;
+			qcom,dump-size = <0x11100>;
 			qcom,dump-id = <0x61>;
 		};
 
 		l1_icache200 {
-			qcom,dump-size = <0x9100>;
+			qcom,dump-size = <0x11100>;
 			qcom,dump-id = <0x62>;
 		};
 
 		l1_icache300 {
-			qcom,dump-size = <0x9100>;
+			qcom,dump-size = <0x11100>;
 			qcom,dump-id = <0x63>;
 		};
 
@@ -181,7 +126,7 @@
 		};
 
 		l1_dcache300 {
-			qcom,dump-size = <0x9100>;
+			qcom,dump-size = <0xd100>;
 			qcom,dump-id = <0x83>;
 		};
 
@@ -205,11 +150,6 @@
 			qcom,dump-id = <0x87>;
 		};
 
-		l1_itlb400 {
-			qcom,dump-size = <0x600>;
-			qcom,dump-id = <0x24>;
-		};
-
 		l1_itlb500 {
 			qcom,dump-size = <0x600>;
 			qcom,dump-id = <0x25>;
@@ -225,11 +165,6 @@
 			qcom,dump-id = <0x27>;
 		};
 
-		l1_dtlb400 {
-			qcom,dump-size = <0x600>;
-			qcom,dump-id = <0x44>;
-		};
-
 		l1_dtlb500 {
 			qcom,dump-size = <0x600>;
 			qcom,dump-id = <0x45>;
@@ -246,22 +181,22 @@
 		};
 
 		l2_cache0 {
-			qcom,dump-size = <0x14100>;
+			qcom,dump-size = <0x24100>;
 			qcom,dump-id = <0xc0>;
 		};
 
 		l2_cache100 {
-			qcom,dump-size = <0x14100>;
+			qcom,dump-size = <0x24100>;
 			qcom,dump-id = <0xc1>;
 		};
 
 		l2_cache200 {
-			qcom,dump-size = <0x14100>;
+			qcom,dump-size = <0x24100>;
 			qcom,dump-id = <0xc2>;
 		};
 
 		l2_cache300 {
-			qcom,dump-size = <0x14100>;
+			qcom,dump-size = <0xd0100>;
 			qcom,dump-id = <0xc3>;
 		};
 
@@ -271,12 +206,12 @@
 		};
 
 		l2_cache500 {
-			qcom,dump-size = <0xd0100>;
+			qcom,dump-size = <0x68100>;
 			qcom,dump-id = <0xc5>;
 		};
 
 		l2_cache600 {
-			qcom,dump-size = <0xd0100>;
+			qcom,dump-size = <0x68100>;
 			qcom,dump-id = <0xc6>;
 		};
 
@@ -286,42 +221,32 @@
 		};
 
 		l2_tlb0 {
-			qcom,dump-size = <0x2100>;
+			qcom,dump-size = <0xf700>;
 			qcom,dump-id = <0x120>;
 		};
 
 		l2_tlb100 {
-			qcom,dump-size = <0x2100>;
+			qcom,dump-size = <0xf700>;
 			qcom,dump-id = <0x121>;
 		};
 
 		l2_tlb200 {
-			qcom,dump-size = <0x2100>;
+			qcom,dump-size = <0xf700>;
 			qcom,dump-id = <0x122>;
 		};
 
-		l2_tlb300 {
-			qcom,dump-size = <0x2100>;
-			qcom,dump-id = <0x123>;
-		};
-
-		l2_tlb400 {
-			qcom,dump-size = <0xc100>;
-			qcom,dump-id = <0x124>;
-		};
-
 		l2_tlb500 {
-			qcom,dump-size = <0xc100>;
+			qcom,dump-size = <0x7900>;
 			qcom,dump-id = <0x125>;
 		};
 
 		l2_tlb600 {
-			qcom,dump-size = <0xc100>;
+			qcom,dump-size = <0x7900>;
 			qcom,dump-id = <0x126>;
 		};
 
 		l2_tlb700 {
-			qcom,dump-size = <0xc100>;
+			qcom,dump-size = <0xa900>;
 			qcom,dump-id = <0x127>;
 		};
 
@@ -340,11 +265,6 @@
 			qcom,dump-id = <0x172>;
 		};
 
-		l1dcdirty300 {
-			qcom,dump-size = <0x1100>;
-			qcom,dump-id = <0x173>;
-		};
-
 		l1dcmte0 {
 			qcom,dump-size = <0x1100>;
 			qcom,dump-id = <0x180>;
@@ -360,11 +280,6 @@
 			qcom,dump-id = <0x182>;
 		};
 
-		l1dcmte300 {
-			qcom,dump-size = <0x1100>;
-			qcom,dump-id = <0x183>;
-		};
-
 		l2dcmte0 {
 			qcom,dump-size = <0x4100>;
 			qcom,dump-id = <0x190>;
@@ -380,36 +295,21 @@
 			qcom,dump-id = <0x192>;
 		};
 
-		l2dcmte300 {
-			qcom,dump-size = <0x4100>;
-			qcom,dump-id = <0x193>;
-		};
-
-		l0mopca400 {
-			qcom,dump-size = <0x6100>;
-			qcom,dump-id = <0x1a4>;
-		};
-
 		l0mopca500 {
-			qcom,dump-size = <0x6100>;
+			qcom,dump-size = <0x4100>;
 			qcom,dump-id = <0x1a5>;
 		};
 
 		l0mopca600 {
-			qcom,dump-size = <0x6100>;
+			qcom,dump-size = <0x4100>;
 			qcom,dump-id = <0x1a6>;
 		};
 
 		l0mopca700 {
-			qcom,dump-size = <0xc100>;
+			qcom,dump-size = <0x4100>;
 			qcom,dump-id = <0x1a7>;
 		};
 
-		l1btb400 {
-			qcom,dump-size = <0x10100>;
-			qcom,dump-id = <0x1b4>;
-		};
-
 		l1btb500 {
 			qcom,dump-size = <0x10100>;
 			qcom,dump-id = <0x1b5>;
@@ -420,16 +320,6 @@
 			qcom,dump-id = <0x1b6>;
 		};
 
-		l1btb700 {
-			qcom,dump-size = <0x10100>;
-			qcom,dump-id = <0x1b7>;
-		};
-
-		l1ghb400 {
-			qcom,dump-size = <0x4100>;
-			qcom,dump-id = <0x1c4>;
-		};
-
 		l1ghb500 {
 			qcom,dump-size = <0x4100>;
 			qcom,dump-id = <0x1c5>;
@@ -440,16 +330,6 @@
 			qcom,dump-id = <0x1c6>;
 		};
 
-		l1ghb700 {
-			qcom,dump-size = <0x8100>;
-			qcom,dump-id = <0x1c7>;
-		};
-
-		l1bim400 {
-			qcom,dump-size = <0x2100>;
-			qcom,dump-id = <0x1d4>;
-		};
-
 		l1bim500 {
 			qcom,dump-size = <0x2100>;
 			qcom,dump-id = <0x1d5>;
@@ -460,16 +340,6 @@
 			qcom,dump-id = <0x1d6>;
 		};
 
-		l1bim700 {
-			qcom,dump-size = <0x4100>;
-			qcom,dump-id = <0x1d7>;
-		};
-
-		l2victim400 {
-			qcom,dump-size = <0x2100>;
-			qcom,dump-id = <0x1e4>;
-		};
-
 		l2victim500 {
 			qcom,dump-size = <0x2100>;
 			qcom,dump-id = <0x1e5>;
@@ -485,6 +355,26 @@
 			qcom,dump-id = <0x1e7>;
 		};
 
+		l2tldtcsp300 {
+			qcom,dump-size = <0x7900>;
+			qcom,dump-id = <0x203>;
+		};
+
+		l2tldtcsp400 {
+			qcom,dump-size = <0x7900>;
+			qcom,dump-id = <0x204>;
+		};
+
+		l2tldtcmp300 {
+			qcom,dump-size = <0x1300>;
+			qcom,dump-id = <0x213>;
+		};
+
+		l2tldtcmp400 {
+			qcom,dump-size = <0x1300>;
+			qcom,dump-id = <0x214>;
+		};
+
 		cpuss_reg {
 			qcom,dump-size = <0x30000>;
 			qcom,dump-id = <0xef>;