From 626d6ef343f13b63c62836d1054936081f8072c4 Mon Sep 17 00:00:00 2001
From: Mahadevan <mahap@codeaurora.org>
Date: Fri, 18 Dec 2020 10:19:12 +0530
Subject: [PATCH] disp: msm: re-factor debug bus logic to dump all test points

As per the HW teams guidelines, allow dumping the status of
all the HW blocks blocks at every test point.
This code brings in the following changes
1) Featurize the hw block  and test point range per target.
2) Reduce the debug bus entries and decrease the static
   memory foot print.
3) Allow analyzers to be integrated into the new format.

Change-Id: Ic3bc2c1b77f5617b0f81a2066b22e50cfd6ff8dd
Signed-off-by: Mahadevan <mahap@codeaurora.org>
---
 msm/sde_dbg.c | 4180 ++-----------------------------------------------
 1 file changed, 151 insertions(+), 4029 deletions(-)

diff --git a/msm/sde_dbg.c b/msm/sde_dbg.c
index 06b06ccf3f..2d3f68172a 100644
--- a/msm/sde_dbg.c
+++ b/msm/sde_dbg.c
@@ -87,6 +87,8 @@
 #define DUMP_CLMN_COUNT			4
 #define DUMP_LINE_SIZE			256
 #define DUMP_MAX_LINES_PER_BLK		512
+#define EXT_TEST_GROUP_SEL_EN		0x7
+#define DSPP_DEBUGBUS_CTRL_EN		0x7001
 
 #define SDE_HW_REV_MAJOR(rev) ((rev) >> 28)
 
@@ -151,9 +153,12 @@ struct sde_dbg_reg_base {
 struct sde_debug_bus_entry {
 	u32 wr_addr;
 	u32 block_id;
+	u32 block_id_max_cnt;
 	u32 test_id;
+	u32 test_id_max_cnt;
 	void (*analyzer)(void __iomem *mem_base,
-				struct sde_debug_bus_entry *entry, u32 val);
+				struct sde_debug_bus_entry *entry, u32 val,
+				u32 block_id_cnt, u32 test_id_cnt);
 };
 
 struct vbif_debug_bus_entry {
@@ -287,3968 +292,88 @@ static DEFINE_MUTEX(sde_dbg_dsi_mutex);
 struct sde_dbg_evtlog *sde_dbg_base_evtlog;
 
 static void _sde_debug_bus_xbar_dump(void __iomem *mem_base,
-		struct sde_debug_bus_entry *entry, u32 val)
+		struct sde_debug_bus_entry *entry, u32 val, u32 block_id_cnt,
+		u32 test_id_cnt)
 {
 	dev_err(sde_dbg_base.dev, "xbar 0x%x %d %d 0x%x\n",
-			entry->wr_addr, entry->block_id, entry->test_id, val);
+			entry->wr_addr, entry->block_id + block_id_cnt,
+			entry->test_id + test_id_cnt, val);
 }
 
 static void _sde_debug_bus_lm_dump(void __iomem *mem_base,
-		struct sde_debug_bus_entry *entry, u32 val)
+		struct sde_debug_bus_entry *entry, u32 val, u32 block_id_cnt,
+		u32 test_id_cnt)
 {
 	if (!(val & 0xFFF000))
 		return;
 
 	dev_err(sde_dbg_base.dev, "lm 0x%x %d %d 0x%x\n",
-			entry->wr_addr, entry->block_id, entry->test_id, val);
+			entry->wr_addr, entry->block_id + block_id_cnt,
+			entry->test_id + test_id_cnt, val);
 }
 
 static void _sde_debug_bus_ppb0_dump(void __iomem *mem_base,
-		struct sde_debug_bus_entry *entry, u32 val)
+		struct sde_debug_bus_entry *entry, u32 val, u32 block_id_cnt,
+		u32 test_id_cnt)
 {
 	if (!(val & BIT(15)))
 		return;
 
 	dev_err(sde_dbg_base.dev, "ppb0 0x%x %d %d 0x%x\n",
-			entry->wr_addr, entry->block_id, entry->test_id, val);
-}
-
-static void _sde_debug_bus_ltm_dump(void __iomem *mem_base,
-		struct sde_debug_bus_entry *entry, u32 val)
-{
-	dev_info(sde_dbg_base.dev, "ltm 0x%x %d %d 0x%x\n",
-			entry->wr_addr, entry->block_id, entry->test_id, val);
+			entry->wr_addr, entry->block_id + block_id_cnt,
+			entry->test_id + test_id_cnt, val);
 }
 
 static void _sde_debug_bus_ppb1_dump(void __iomem *mem_base,
-		struct sde_debug_bus_entry *entry, u32 val)
+		struct sde_debug_bus_entry *entry, u32 val, u32 block_id_cnt,
+		u32 test_id_cnt)
 {
 	if (!(val & BIT(15)))
 		return;
 
 	dev_err(sde_dbg_base.dev, "ppb1 0x%x %d %d 0x%x\n",
-			entry->wr_addr, entry->block_id, entry->test_id, val);
+			entry->wr_addr, entry->block_id + block_id_cnt,
+			entry->test_id + test_id_cnt, val);
 }
 
-static struct sde_debug_bus_entry dbg_bus_sde_sm8150[] = {
+static struct sde_debug_bus_entry dbg_bus_sde[] = {
 
-	/* Unpack 0 sspp 0*/
-	{ DBGBUS_SSPP0, 35, 2 },
-	{ DBGBUS_SSPP0, 50, 2 },
-	{ DBGBUS_SSPP0, 60, 2 },
-	{ DBGBUS_SSPP0, 70, 2 },
-
-	/* Unpack 1 sspp 0*/
-	{ DBGBUS_SSPP0, 36, 2 },
-	{ DBGBUS_SSPP0, 51, 2 },
-	{ DBGBUS_SSPP0, 61, 2 },
-	{ DBGBUS_SSPP0, 71, 2 },
-
-	/* Unpack 2 sspp 0*/
-	{ DBGBUS_SSPP0, 37, 2 },
-	{ DBGBUS_SSPP0, 52, 2 },
-	{ DBGBUS_SSPP0, 62, 2 },
-	{ DBGBUS_SSPP0, 72, 2 },
-
-
-	/* Unpack 3 sspp 0*/
-	{ DBGBUS_SSPP0, 38, 2 },
-	{ DBGBUS_SSPP0, 53, 2 },
-	{ DBGBUS_SSPP0, 63, 2 },
-	{ DBGBUS_SSPP0, 73, 2 },
-
-	/* Unpack 0 sspp 1*/
-	{ DBGBUS_SSPP1, 35, 2 },
-	{ DBGBUS_SSPP1, 50, 2 },
-	{ DBGBUS_SSPP1, 60, 2 },
-	{ DBGBUS_SSPP1, 70, 2 },
-
-	/* Unpack 1 sspp 1*/
-	{ DBGBUS_SSPP1, 36, 2 },
-	{ DBGBUS_SSPP1, 51, 2 },
-	{ DBGBUS_SSPP1, 61, 2 },
-	{ DBGBUS_SSPP1, 71, 2 },
-
-	/* Unpack 2 sspp 1*/
-	{ DBGBUS_SSPP1, 37, 2 },
-	{ DBGBUS_SSPP1, 52, 2 },
-	{ DBGBUS_SSPP1, 62, 2 },
-	{ DBGBUS_SSPP1, 72, 2 },
-
-
-	/* Unpack 3 sspp 1*/
-	{ DBGBUS_SSPP1, 38, 2 },
-	{ DBGBUS_SSPP1, 53, 2 },
-	{ DBGBUS_SSPP1, 63, 2 },
-	{ DBGBUS_SSPP1, 73, 2 },
-
-	/* scheduler */
-	{ DBGBUS_DSPP, 130, 0 },
-	{ DBGBUS_DSPP, 130, 1 },
-	{ DBGBUS_DSPP, 130, 2 },
-	{ DBGBUS_DSPP, 130, 3 },
-	{ DBGBUS_DSPP, 130, 4 },
-	{ DBGBUS_DSPP, 130, 5 },
-
-
-	/* fetch sspp0 */
-
-	/* vig 0 */
-	{ DBGBUS_SSPP0, 0, 0 },
-	{ DBGBUS_SSPP0, 0, 1 },
-	{ DBGBUS_SSPP0, 0, 2 },
-	{ DBGBUS_SSPP0, 0, 3 },
-	{ DBGBUS_SSPP0, 0, 4 },
-	{ DBGBUS_SSPP0, 0, 5 },
-	{ DBGBUS_SSPP0, 0, 6 },
-	{ DBGBUS_SSPP0, 0, 7 },
-
-	{ DBGBUS_SSPP0, 1, 0 },
-	{ DBGBUS_SSPP0, 1, 1 },
-	{ DBGBUS_SSPP0, 1, 2 },
-	{ DBGBUS_SSPP0, 1, 3 },
-	{ DBGBUS_SSPP0, 1, 4 },
-	{ DBGBUS_SSPP0, 1, 5 },
-	{ DBGBUS_SSPP0, 1, 6 },
-	{ DBGBUS_SSPP0, 1, 7 },
-
-	{ DBGBUS_SSPP0, 2, 0 },
-	{ DBGBUS_SSPP0, 2, 1 },
-	{ DBGBUS_SSPP0, 2, 2 },
-	{ DBGBUS_SSPP0, 2, 3 },
-	{ DBGBUS_SSPP0, 2, 4 },
-	{ DBGBUS_SSPP0, 2, 5 },
-	{ DBGBUS_SSPP0, 2, 6 },
-	{ DBGBUS_SSPP0, 2, 7 },
-
-	{ DBGBUS_SSPP0, 4, 0 },
-	{ DBGBUS_SSPP0, 4, 1 },
-	{ DBGBUS_SSPP0, 4, 2 },
-	{ DBGBUS_SSPP0, 4, 3 },
-	{ DBGBUS_SSPP0, 4, 4 },
-	{ DBGBUS_SSPP0, 4, 5 },
-	{ DBGBUS_SSPP0, 4, 6 },
-	{ DBGBUS_SSPP0, 4, 7 },
-
-	{ DBGBUS_SSPP0, 5, 0 },
-	{ DBGBUS_SSPP0, 5, 1 },
-	{ DBGBUS_SSPP0, 5, 2 },
-	{ DBGBUS_SSPP0, 5, 3 },
-	{ DBGBUS_SSPP0, 5, 4 },
-	{ DBGBUS_SSPP0, 5, 5 },
-	{ DBGBUS_SSPP0, 5, 6 },
-	{ DBGBUS_SSPP0, 5, 7 },
-
-	/* vig 2 */
-	{ DBGBUS_SSPP0, 20, 0 },
-	{ DBGBUS_SSPP0, 20, 1 },
-	{ DBGBUS_SSPP0, 20, 2 },
-	{ DBGBUS_SSPP0, 20, 3 },
-	{ DBGBUS_SSPP0, 20, 4 },
-	{ DBGBUS_SSPP0, 20, 5 },
-	{ DBGBUS_SSPP0, 20, 6 },
-	{ DBGBUS_SSPP0, 20, 7 },
-
-	{ DBGBUS_SSPP0, 21, 0 },
-	{ DBGBUS_SSPP0, 21, 1 },
-	{ DBGBUS_SSPP0, 21, 2 },
-	{ DBGBUS_SSPP0, 21, 3 },
-	{ DBGBUS_SSPP0, 21, 4 },
-	{ DBGBUS_SSPP0, 21, 5 },
-	{ DBGBUS_SSPP0, 21, 6 },
-	{ DBGBUS_SSPP0, 21, 7 },
-
-	{ DBGBUS_SSPP0, 22, 0 },
-	{ DBGBUS_SSPP0, 22, 1 },
-	{ DBGBUS_SSPP0, 22, 2 },
-	{ DBGBUS_SSPP0, 22, 3 },
-	{ DBGBUS_SSPP0, 22, 4 },
-	{ DBGBUS_SSPP0, 22, 5 },
-	{ DBGBUS_SSPP0, 22, 6 },
-	{ DBGBUS_SSPP0, 22, 7 },
-
-	{ DBGBUS_SSPP0, 24, 0 },
-	{ DBGBUS_SSPP0, 24, 1 },
-	{ DBGBUS_SSPP0, 24, 2 },
-	{ DBGBUS_SSPP0, 24, 3 },
-	{ DBGBUS_SSPP0, 24, 4 },
-	{ DBGBUS_SSPP0, 24, 5 },
-	{ DBGBUS_SSPP0, 24, 6 },
-	{ DBGBUS_SSPP0, 24, 7 },
-
-	{ DBGBUS_SSPP0, 25, 0 },
-	{ DBGBUS_SSPP0, 25, 1 },
-	{ DBGBUS_SSPP0, 25, 2 },
-	{ DBGBUS_SSPP0, 25, 3 },
-	{ DBGBUS_SSPP0, 25, 4 },
-	{ DBGBUS_SSPP0, 25, 5 },
-	{ DBGBUS_SSPP0, 25, 6 },
-	{ DBGBUS_SSPP0, 25, 7 },
-
-	/* dma 2 */
-	{ DBGBUS_SSPP0, 30, 0 },
-	{ DBGBUS_SSPP0, 30, 1 },
-	{ DBGBUS_SSPP0, 30, 2 },
-	{ DBGBUS_SSPP0, 30, 3 },
-	{ DBGBUS_SSPP0, 30, 4 },
-	{ DBGBUS_SSPP0, 30, 5 },
-	{ DBGBUS_SSPP0, 30, 6 },
-	{ DBGBUS_SSPP0, 30, 7 },
-
-	{ DBGBUS_SSPP0, 31, 0 },
-	{ DBGBUS_SSPP0, 31, 1 },
-	{ DBGBUS_SSPP0, 31, 2 },
-	{ DBGBUS_SSPP0, 31, 3 },
-	{ DBGBUS_SSPP0, 31, 4 },
-	{ DBGBUS_SSPP0, 31, 5 },
-	{ DBGBUS_SSPP0, 31, 6 },
-	{ DBGBUS_SSPP0, 31, 7 },
-
-	{ DBGBUS_SSPP0, 32, 0 },
-	{ DBGBUS_SSPP0, 32, 1 },
-	{ DBGBUS_SSPP0, 32, 2 },
-	{ DBGBUS_SSPP0, 32, 3 },
-	{ DBGBUS_SSPP0, 32, 4 },
-	{ DBGBUS_SSPP0, 32, 5 },
-	{ DBGBUS_SSPP0, 32, 6 },
-	{ DBGBUS_SSPP0, 32, 7 },
-
-	{ DBGBUS_SSPP0, 33, 0 },
-	{ DBGBUS_SSPP0, 33, 1 },
-	{ DBGBUS_SSPP0, 33, 2 },
-	{ DBGBUS_SSPP0, 33, 3 },
-	{ DBGBUS_SSPP0, 33, 4 },
-	{ DBGBUS_SSPP0, 33, 5 },
-	{ DBGBUS_SSPP0, 33, 6 },
-	{ DBGBUS_SSPP0, 33, 7 },
-
-	{ DBGBUS_SSPP0, 34, 0 },
-	{ DBGBUS_SSPP0, 34, 1 },
-	{ DBGBUS_SSPP0, 34, 2 },
-	{ DBGBUS_SSPP0, 34, 3 },
-	{ DBGBUS_SSPP0, 34, 4 },
-	{ DBGBUS_SSPP0, 34, 5 },
-	{ DBGBUS_SSPP0, 34, 6 },
-	{ DBGBUS_SSPP0, 34, 7 },
-
-	/* dma 0 */
-	{ DBGBUS_SSPP0, 40, 0 },
-	{ DBGBUS_SSPP0, 40, 1 },
-	{ DBGBUS_SSPP0, 40, 2 },
-	{ DBGBUS_SSPP0, 40, 3 },
-	{ DBGBUS_SSPP0, 40, 4 },
-	{ DBGBUS_SSPP0, 40, 5 },
-	{ DBGBUS_SSPP0, 40, 6 },
-	{ DBGBUS_SSPP0, 40, 7 },
-
-	{ DBGBUS_SSPP0, 41, 0 },
-	{ DBGBUS_SSPP0, 41, 1 },
-	{ DBGBUS_SSPP0, 41, 2 },
-	{ DBGBUS_SSPP0, 41, 3 },
-	{ DBGBUS_SSPP0, 41, 4 },
-	{ DBGBUS_SSPP0, 41, 5 },
-	{ DBGBUS_SSPP0, 41, 6 },
-	{ DBGBUS_SSPP0, 41, 7 },
-
-	{ DBGBUS_SSPP0, 42, 0 },
-	{ DBGBUS_SSPP0, 42, 1 },
-	{ DBGBUS_SSPP0, 42, 2 },
-	{ DBGBUS_SSPP0, 42, 3 },
-	{ DBGBUS_SSPP0, 42, 4 },
-	{ DBGBUS_SSPP0, 42, 5 },
-	{ DBGBUS_SSPP0, 42, 6 },
-	{ DBGBUS_SSPP0, 42, 7 },
-
-	{ DBGBUS_SSPP0, 44, 0 },
-	{ DBGBUS_SSPP0, 44, 1 },
-	{ DBGBUS_SSPP0, 44, 2 },
-	{ DBGBUS_SSPP0, 44, 3 },
-	{ DBGBUS_SSPP0, 44, 4 },
-	{ DBGBUS_SSPP0, 44, 5 },
-	{ DBGBUS_SSPP0, 44, 6 },
-	{ DBGBUS_SSPP0, 44, 7 },
-
-	{ DBGBUS_SSPP0, 45, 0 },
-	{ DBGBUS_SSPP0, 45, 1 },
-	{ DBGBUS_SSPP0, 45, 2 },
-	{ DBGBUS_SSPP0, 45, 3 },
-	{ DBGBUS_SSPP0, 45, 4 },
-	{ DBGBUS_SSPP0, 45, 5 },
-	{ DBGBUS_SSPP0, 45, 6 },
-	{ DBGBUS_SSPP0, 45, 7 },
-
-	/* fetch sspp1 */
-	/* vig 1 */
-	{ DBGBUS_SSPP1, 0, 0 },
-	{ DBGBUS_SSPP1, 0, 1 },
-	{ DBGBUS_SSPP1, 0, 2 },
-	{ DBGBUS_SSPP1, 0, 3 },
-	{ DBGBUS_SSPP1, 0, 4 },
-	{ DBGBUS_SSPP1, 0, 5 },
-	{ DBGBUS_SSPP1, 0, 6 },
-	{ DBGBUS_SSPP1, 0, 7 },
-
-	{ DBGBUS_SSPP1, 1, 0 },
-	{ DBGBUS_SSPP1, 1, 1 },
-	{ DBGBUS_SSPP1, 1, 2 },
-	{ DBGBUS_SSPP1, 1, 3 },
-	{ DBGBUS_SSPP1, 1, 4 },
-	{ DBGBUS_SSPP1, 1, 5 },
-	{ DBGBUS_SSPP1, 1, 6 },
-	{ DBGBUS_SSPP1, 1, 7 },
-
-	{ DBGBUS_SSPP1, 2, 0 },
-	{ DBGBUS_SSPP1, 2, 1 },
-	{ DBGBUS_SSPP1, 2, 2 },
-	{ DBGBUS_SSPP1, 2, 3 },
-	{ DBGBUS_SSPP1, 2, 4 },
-	{ DBGBUS_SSPP1, 2, 5 },
-	{ DBGBUS_SSPP1, 2, 6 },
-	{ DBGBUS_SSPP1, 2, 7 },
-
-	{ DBGBUS_SSPP1, 4, 0 },
-	{ DBGBUS_SSPP1, 4, 1 },
-	{ DBGBUS_SSPP1, 4, 2 },
-	{ DBGBUS_SSPP1, 4, 3 },
-	{ DBGBUS_SSPP1, 4, 4 },
-	{ DBGBUS_SSPP1, 4, 5 },
-	{ DBGBUS_SSPP1, 4, 6 },
-	{ DBGBUS_SSPP1, 4, 7 },
-
-	{ DBGBUS_SSPP1, 5, 0 },
-	{ DBGBUS_SSPP1, 5, 1 },
-	{ DBGBUS_SSPP1, 5, 2 },
-	{ DBGBUS_SSPP1, 5, 3 },
-	{ DBGBUS_SSPP1, 5, 4 },
-	{ DBGBUS_SSPP1, 5, 5 },
-	{ DBGBUS_SSPP1, 5, 6 },
-	{ DBGBUS_SSPP1, 5, 7 },
-
-	/* vig 3 */
-	{ DBGBUS_SSPP1, 20, 0 },
-	{ DBGBUS_SSPP1, 20, 1 },
-	{ DBGBUS_SSPP1, 20, 2 },
-	{ DBGBUS_SSPP1, 20, 3 },
-	{ DBGBUS_SSPP1, 20, 4 },
-	{ DBGBUS_SSPP1, 20, 5 },
-	{ DBGBUS_SSPP1, 20, 6 },
-	{ DBGBUS_SSPP1, 20, 7 },
-
-	{ DBGBUS_SSPP1, 21, 0 },
-	{ DBGBUS_SSPP1, 21, 1 },
-	{ DBGBUS_SSPP1, 21, 2 },
-	{ DBGBUS_SSPP1, 21, 3 },
-	{ DBGBUS_SSPP1, 21, 4 },
-	{ DBGBUS_SSPP1, 21, 5 },
-	{ DBGBUS_SSPP1, 21, 6 },
-	{ DBGBUS_SSPP1, 21, 7 },
-
-	{ DBGBUS_SSPP1, 22, 0 },
-	{ DBGBUS_SSPP1, 22, 1 },
-	{ DBGBUS_SSPP1, 22, 2 },
-	{ DBGBUS_SSPP1, 22, 3 },
-	{ DBGBUS_SSPP1, 22, 4 },
-	{ DBGBUS_SSPP1, 22, 5 },
-	{ DBGBUS_SSPP1, 22, 6 },
-	{ DBGBUS_SSPP1, 22, 7 },
-
-	{ DBGBUS_SSPP1, 24, 0 },
-	{ DBGBUS_SSPP1, 24, 1 },
-	{ DBGBUS_SSPP1, 24, 2 },
-	{ DBGBUS_SSPP1, 24, 3 },
-	{ DBGBUS_SSPP1, 24, 4 },
-	{ DBGBUS_SSPP1, 24, 5 },
-	{ DBGBUS_SSPP1, 24, 6 },
-	{ DBGBUS_SSPP1, 24, 7 },
-
-	{ DBGBUS_SSPP1, 25, 0 },
-	{ DBGBUS_SSPP1, 25, 1 },
-	{ DBGBUS_SSPP1, 25, 2 },
-	{ DBGBUS_SSPP1, 25, 3 },
-	{ DBGBUS_SSPP1, 25, 4 },
-	{ DBGBUS_SSPP1, 25, 5 },
-	{ DBGBUS_SSPP1, 25, 6 },
-	{ DBGBUS_SSPP1, 25, 7 },
-
-	/* dma 3 */
-	{ DBGBUS_SSPP1, 30, 0 },
-	{ DBGBUS_SSPP1, 30, 1 },
-	{ DBGBUS_SSPP1, 30, 2 },
-	{ DBGBUS_SSPP1, 30, 3 },
-	{ DBGBUS_SSPP1, 30, 4 },
-	{ DBGBUS_SSPP1, 30, 5 },
-	{ DBGBUS_SSPP1, 30, 6 },
-	{ DBGBUS_SSPP1, 30, 7 },
-
-	{ DBGBUS_SSPP1, 31, 0 },
-	{ DBGBUS_SSPP1, 31, 1 },
-	{ DBGBUS_SSPP1, 31, 2 },
-	{ DBGBUS_SSPP1, 31, 3 },
-	{ DBGBUS_SSPP1, 31, 4 },
-	{ DBGBUS_SSPP1, 31, 5 },
-	{ DBGBUS_SSPP1, 31, 6 },
-	{ DBGBUS_SSPP1, 31, 7 },
-
-	{ DBGBUS_SSPP1, 32, 0 },
-	{ DBGBUS_SSPP1, 32, 1 },
-	{ DBGBUS_SSPP1, 32, 2 },
-	{ DBGBUS_SSPP1, 32, 3 },
-	{ DBGBUS_SSPP1, 32, 4 },
-	{ DBGBUS_SSPP1, 32, 5 },
-	{ DBGBUS_SSPP1, 32, 6 },
-	{ DBGBUS_SSPP1, 32, 7 },
-
-	{ DBGBUS_SSPP1, 33, 0 },
-	{ DBGBUS_SSPP1, 33, 1 },
-	{ DBGBUS_SSPP1, 33, 2 },
-	{ DBGBUS_SSPP1, 33, 3 },
-	{ DBGBUS_SSPP1, 33, 4 },
-	{ DBGBUS_SSPP1, 33, 5 },
-	{ DBGBUS_SSPP1, 33, 6 },
-	{ DBGBUS_SSPP1, 33, 7 },
-
-	{ DBGBUS_SSPP1, 34, 0 },
-	{ DBGBUS_SSPP1, 34, 1 },
-	{ DBGBUS_SSPP1, 34, 2 },
-	{ DBGBUS_SSPP1, 34, 3 },
-	{ DBGBUS_SSPP1, 34, 4 },
-	{ DBGBUS_SSPP1, 34, 5 },
-	{ DBGBUS_SSPP1, 34, 6 },
-	{ DBGBUS_SSPP1, 34, 7 },
-
-	/* dma 1 */
-	{ DBGBUS_SSPP1, 40, 0 },
-	{ DBGBUS_SSPP1, 40, 1 },
-	{ DBGBUS_SSPP1, 40, 2 },
-	{ DBGBUS_SSPP1, 40, 3 },
-	{ DBGBUS_SSPP1, 40, 4 },
-	{ DBGBUS_SSPP1, 40, 5 },
-	{ DBGBUS_SSPP1, 40, 6 },
-	{ DBGBUS_SSPP1, 40, 7 },
-
-	{ DBGBUS_SSPP1, 41, 0 },
-	{ DBGBUS_SSPP1, 41, 1 },
-	{ DBGBUS_SSPP1, 41, 2 },
-	{ DBGBUS_SSPP1, 41, 3 },
-	{ DBGBUS_SSPP1, 41, 4 },
-	{ DBGBUS_SSPP1, 41, 5 },
-	{ DBGBUS_SSPP1, 41, 6 },
-	{ DBGBUS_SSPP1, 41, 7 },
-
-	{ DBGBUS_SSPP1, 42, 0 },
-	{ DBGBUS_SSPP1, 42, 1 },
-	{ DBGBUS_SSPP1, 42, 2 },
-	{ DBGBUS_SSPP1, 42, 3 },
-	{ DBGBUS_SSPP1, 42, 4 },
-	{ DBGBUS_SSPP1, 42, 5 },
-	{ DBGBUS_SSPP1, 42, 6 },
-	{ DBGBUS_SSPP1, 42, 7 },
-
-	{ DBGBUS_SSPP1, 44, 0 },
-	{ DBGBUS_SSPP1, 44, 1 },
-	{ DBGBUS_SSPP1, 44, 2 },
-	{ DBGBUS_SSPP1, 44, 3 },
-	{ DBGBUS_SSPP1, 44, 4 },
-	{ DBGBUS_SSPP1, 44, 5 },
-	{ DBGBUS_SSPP1, 44, 6 },
-	{ DBGBUS_SSPP1, 44, 7 },
-
-	{ DBGBUS_SSPP1, 45, 0 },
-	{ DBGBUS_SSPP1, 45, 1 },
-	{ DBGBUS_SSPP1, 45, 2 },
-	{ DBGBUS_SSPP1, 45, 3 },
-	{ DBGBUS_SSPP1, 45, 4 },
-	{ DBGBUS_SSPP1, 45, 5 },
-	{ DBGBUS_SSPP1, 45, 6 },
-	{ DBGBUS_SSPP1, 45, 7 },
+	{ DBGBUS_SSPP0, 0, 256, 0, 8 },
+	{ DBGBUS_AXI_INTF, 0, 256, 0, 8 },
+	{ DBGBUS_SSPP1, 0, 256, 0, 8 },
+	{ DBGBUS_DSPP, 0, 256, 0, 32 },
+	{ DBGBUS_PERIPH, 0, 256, 0, 8 },
 
 	/* ppb_0 */
-	{ DBGBUS_DSPP, 31, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 33, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 35, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 42, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 47, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 49, 0, _sde_debug_bus_ppb0_dump },
+	{ DBGBUS_DSPP, 31, 1, 0, 1, _sde_debug_bus_ppb0_dump },
+	{ DBGBUS_DSPP, 33, 1, 0, 1, _sde_debug_bus_ppb0_dump },
+	{ DBGBUS_DSPP, 35, 1, 0, 1, _sde_debug_bus_ppb0_dump },
+	{ DBGBUS_DSPP, 42, 1, 0, 1, _sde_debug_bus_ppb0_dump },
+	{ DBGBUS_DSPP, 47, 1, 0, 1, _sde_debug_bus_ppb0_dump },
+	{ DBGBUS_DSPP, 49, 1, 0, 1, _sde_debug_bus_ppb0_dump },
 
 	/* ppb_1 */
-	{ DBGBUS_DSPP, 32, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 34, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 36, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 43, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 48, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 50, 0, _sde_debug_bus_ppb1_dump },
+	{ DBGBUS_DSPP, 32, 1, 0, 1, _sde_debug_bus_ppb1_dump },
+	{ DBGBUS_DSPP, 34, 1, 0, 1, _sde_debug_bus_ppb1_dump },
+	{ DBGBUS_DSPP, 36, 1, 0, 1, _sde_debug_bus_ppb1_dump },
+	{ DBGBUS_DSPP, 43, 1, 0, 1, _sde_debug_bus_ppb1_dump },
+	{ DBGBUS_DSPP, 48, 1, 0, 1, _sde_debug_bus_ppb1_dump },
+	{ DBGBUS_DSPP, 50, 1, 0, 1, _sde_debug_bus_ppb1_dump },
 
 	/* crossbar */
-	{ DBGBUS_DSPP, 0, 0, _sde_debug_bus_xbar_dump },
-
-	/* rotator */
-	{ DBGBUS_DSPP, 9, 0},
+	{ DBGBUS_DSPP, 0, 1, 0, 1, _sde_debug_bus_xbar_dump },
 
 	/* blend */
-	/* LM0 */
-	{ DBGBUS_DSPP, 63, 1},
-	{ DBGBUS_DSPP, 63, 2},
-	{ DBGBUS_DSPP, 63, 3},
-	{ DBGBUS_DSPP, 63, 4},
-	{ DBGBUS_DSPP, 63, 5},
-	{ DBGBUS_DSPP, 63, 6},
-	{ DBGBUS_DSPP, 63, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 64, 1},
-	{ DBGBUS_DSPP, 64, 2},
-	{ DBGBUS_DSPP, 64, 3},
-	{ DBGBUS_DSPP, 64, 4},
-	{ DBGBUS_DSPP, 64, 5},
-	{ DBGBUS_DSPP, 64, 6},
-	{ DBGBUS_DSPP, 64, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 65, 1},
-	{ DBGBUS_DSPP, 65, 2},
-	{ DBGBUS_DSPP, 65, 3},
-	{ DBGBUS_DSPP, 65, 4},
-	{ DBGBUS_DSPP, 65, 5},
-	{ DBGBUS_DSPP, 65, 6},
-	{ DBGBUS_DSPP, 65, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 66, 1},
-	{ DBGBUS_DSPP, 66, 2},
-	{ DBGBUS_DSPP, 66, 3},
-	{ DBGBUS_DSPP, 66, 4},
-	{ DBGBUS_DSPP, 66, 5},
-	{ DBGBUS_DSPP, 66, 6},
-	{ DBGBUS_DSPP, 66, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 67, 1},
-	{ DBGBUS_DSPP, 67, 2},
-	{ DBGBUS_DSPP, 67, 3},
-	{ DBGBUS_DSPP, 67, 4},
-	{ DBGBUS_DSPP, 67, 5},
-	{ DBGBUS_DSPP, 67, 6},
-	{ DBGBUS_DSPP, 67, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 68, 1},
-	{ DBGBUS_DSPP, 68, 2},
-	{ DBGBUS_DSPP, 68, 3},
-	{ DBGBUS_DSPP, 68, 4},
-	{ DBGBUS_DSPP, 68, 5},
-	{ DBGBUS_DSPP, 68, 6},
-	{ DBGBUS_DSPP, 68, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 69, 1},
-	{ DBGBUS_DSPP, 69, 2},
-	{ DBGBUS_DSPP, 69, 3},
-	{ DBGBUS_DSPP, 69, 4},
-	{ DBGBUS_DSPP, 69, 5},
-	{ DBGBUS_DSPP, 69, 6},
-	{ DBGBUS_DSPP, 69, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 84, 1},
-	{ DBGBUS_DSPP, 84, 2},
-	{ DBGBUS_DSPP, 84, 3},
-	{ DBGBUS_DSPP, 84, 4},
-	{ DBGBUS_DSPP, 84, 5},
-	{ DBGBUS_DSPP, 84, 6},
-	{ DBGBUS_DSPP, 84, 7, _sde_debug_bus_lm_dump },
-
-
-	{ DBGBUS_DSPP, 85, 1},
-	{ DBGBUS_DSPP, 85, 2},
-	{ DBGBUS_DSPP, 85, 3},
-	{ DBGBUS_DSPP, 85, 4},
-	{ DBGBUS_DSPP, 85, 5},
-	{ DBGBUS_DSPP, 85, 6},
-	{ DBGBUS_DSPP, 85, 7, _sde_debug_bus_lm_dump },
-
-
-	{ DBGBUS_DSPP, 86, 1},
-	{ DBGBUS_DSPP, 86, 2},
-	{ DBGBUS_DSPP, 86, 3},
-	{ DBGBUS_DSPP, 86, 4},
-	{ DBGBUS_DSPP, 86, 5},
-	{ DBGBUS_DSPP, 86, 6},
-	{ DBGBUS_DSPP, 86, 7, _sde_debug_bus_lm_dump },
-
-
-	{ DBGBUS_DSPP, 87, 1},
-	{ DBGBUS_DSPP, 87, 2},
-	{ DBGBUS_DSPP, 87, 3},
-	{ DBGBUS_DSPP, 87, 4},
-	{ DBGBUS_DSPP, 87, 5},
-	{ DBGBUS_DSPP, 87, 6},
-	{ DBGBUS_DSPP, 87, 7, _sde_debug_bus_lm_dump },
-
-	/* LM1 */
-	{ DBGBUS_DSPP, 70, 1},
-	{ DBGBUS_DSPP, 70, 2},
-	{ DBGBUS_DSPP, 70, 3},
-	{ DBGBUS_DSPP, 70, 4},
-	{ DBGBUS_DSPP, 70, 5},
-	{ DBGBUS_DSPP, 70, 6},
-	{ DBGBUS_DSPP, 70, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 71, 1},
-	{ DBGBUS_DSPP, 71, 2},
-	{ DBGBUS_DSPP, 71, 3},
-	{ DBGBUS_DSPP, 71, 4},
-	{ DBGBUS_DSPP, 71, 5},
-	{ DBGBUS_DSPP, 71, 6},
-	{ DBGBUS_DSPP, 71, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 72, 1},
-	{ DBGBUS_DSPP, 72, 2},
-	{ DBGBUS_DSPP, 72, 3},
-	{ DBGBUS_DSPP, 72, 4},
-	{ DBGBUS_DSPP, 72, 5},
-	{ DBGBUS_DSPP, 72, 6},
-	{ DBGBUS_DSPP, 72, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 73, 1},
-	{ DBGBUS_DSPP, 73, 2},
-	{ DBGBUS_DSPP, 73, 3},
-	{ DBGBUS_DSPP, 73, 4},
-	{ DBGBUS_DSPP, 73, 5},
-	{ DBGBUS_DSPP, 73, 6},
-	{ DBGBUS_DSPP, 73, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 74, 1},
-	{ DBGBUS_DSPP, 74, 2},
-	{ DBGBUS_DSPP, 74, 3},
-	{ DBGBUS_DSPP, 74, 4},
-	{ DBGBUS_DSPP, 74, 5},
-	{ DBGBUS_DSPP, 74, 6},
-	{ DBGBUS_DSPP, 74, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 75, 1},
-	{ DBGBUS_DSPP, 75, 2},
-	{ DBGBUS_DSPP, 75, 3},
-	{ DBGBUS_DSPP, 75, 4},
-	{ DBGBUS_DSPP, 75, 5},
-	{ DBGBUS_DSPP, 75, 6},
-	{ DBGBUS_DSPP, 75, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 76, 1},
-	{ DBGBUS_DSPP, 76, 2},
-	{ DBGBUS_DSPP, 76, 3},
-	{ DBGBUS_DSPP, 76, 4},
-	{ DBGBUS_DSPP, 76, 5},
-	{ DBGBUS_DSPP, 76, 6},
-	{ DBGBUS_DSPP, 76, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 88, 1},
-	{ DBGBUS_DSPP, 88, 2},
-	{ DBGBUS_DSPP, 88, 3},
-	{ DBGBUS_DSPP, 88, 4},
-	{ DBGBUS_DSPP, 88, 5},
-	{ DBGBUS_DSPP, 88, 6},
-	{ DBGBUS_DSPP, 88, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 89, 1},
-	{ DBGBUS_DSPP, 89, 2},
-	{ DBGBUS_DSPP, 89, 3},
-	{ DBGBUS_DSPP, 89, 4},
-	{ DBGBUS_DSPP, 89, 5},
-	{ DBGBUS_DSPP, 89, 6},
-	{ DBGBUS_DSPP, 89, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 90, 1},
-	{ DBGBUS_DSPP, 90, 2},
-	{ DBGBUS_DSPP, 90, 3},
-	{ DBGBUS_DSPP, 90, 4},
-	{ DBGBUS_DSPP, 90, 5},
-	{ DBGBUS_DSPP, 90, 6},
-	{ DBGBUS_DSPP, 90, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 91, 1},
-	{ DBGBUS_DSPP, 91, 2},
-	{ DBGBUS_DSPP, 91, 3},
-	{ DBGBUS_DSPP, 91, 4},
-	{ DBGBUS_DSPP, 91, 5},
-	{ DBGBUS_DSPP, 91, 6},
-	{ DBGBUS_DSPP, 91, 7, _sde_debug_bus_lm_dump },
-
-	/* LM2 */
-	{ DBGBUS_DSPP, 77, 0},
-	{ DBGBUS_DSPP, 77, 1},
-	{ DBGBUS_DSPP, 77, 2},
-	{ DBGBUS_DSPP, 77, 3},
-	{ DBGBUS_DSPP, 77, 4},
-	{ DBGBUS_DSPP, 77, 5},
-	{ DBGBUS_DSPP, 77, 6},
-	{ DBGBUS_DSPP, 77, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 78, 0},
-	{ DBGBUS_DSPP, 78, 1},
-	{ DBGBUS_DSPP, 78, 2},
-	{ DBGBUS_DSPP, 78, 3},
-	{ DBGBUS_DSPP, 78, 4},
-	{ DBGBUS_DSPP, 78, 5},
-	{ DBGBUS_DSPP, 78, 6},
-	{ DBGBUS_DSPP, 78, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 79, 0},
-	{ DBGBUS_DSPP, 79, 1},
-	{ DBGBUS_DSPP, 79, 2},
-	{ DBGBUS_DSPP, 79, 3},
-	{ DBGBUS_DSPP, 79, 4},
-	{ DBGBUS_DSPP, 79, 5},
-	{ DBGBUS_DSPP, 79, 6},
-	{ DBGBUS_DSPP, 79, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 80, 0},
-	{ DBGBUS_DSPP, 80, 1},
-	{ DBGBUS_DSPP, 80, 2},
-	{ DBGBUS_DSPP, 80, 3},
-	{ DBGBUS_DSPP, 80, 4},
-	{ DBGBUS_DSPP, 80, 5},
-	{ DBGBUS_DSPP, 80, 6},
-	{ DBGBUS_DSPP, 80, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 81, 0},
-	{ DBGBUS_DSPP, 81, 1},
-	{ DBGBUS_DSPP, 81, 2},
-	{ DBGBUS_DSPP, 81, 3},
-	{ DBGBUS_DSPP, 81, 4},
-	{ DBGBUS_DSPP, 81, 5},
-	{ DBGBUS_DSPP, 81, 6},
-	{ DBGBUS_DSPP, 81, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 82, 0},
-	{ DBGBUS_DSPP, 82, 1},
-	{ DBGBUS_DSPP, 82, 2},
-	{ DBGBUS_DSPP, 82, 3},
-	{ DBGBUS_DSPP, 82, 4},
-	{ DBGBUS_DSPP, 82, 5},
-	{ DBGBUS_DSPP, 82, 6},
-	{ DBGBUS_DSPP, 82, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 83, 0},
-	{ DBGBUS_DSPP, 83, 1},
-	{ DBGBUS_DSPP, 83, 2},
-	{ DBGBUS_DSPP, 83, 3},
-	{ DBGBUS_DSPP, 83, 4},
-	{ DBGBUS_DSPP, 83, 5},
-	{ DBGBUS_DSPP, 83, 6},
-	{ DBGBUS_DSPP, 83, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 92, 1},
-	{ DBGBUS_DSPP, 92, 2},
-	{ DBGBUS_DSPP, 92, 3},
-	{ DBGBUS_DSPP, 92, 4},
-	{ DBGBUS_DSPP, 92, 5},
-	{ DBGBUS_DSPP, 92, 6},
-	{ DBGBUS_DSPP, 92, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 93, 1},
-	{ DBGBUS_DSPP, 93, 2},
-	{ DBGBUS_DSPP, 93, 3},
-	{ DBGBUS_DSPP, 93, 4},
-	{ DBGBUS_DSPP, 93, 5},
-	{ DBGBUS_DSPP, 93, 6},
-	{ DBGBUS_DSPP, 93, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 94, 1},
-	{ DBGBUS_DSPP, 94, 2},
-	{ DBGBUS_DSPP, 94, 3},
-	{ DBGBUS_DSPP, 94, 4},
-	{ DBGBUS_DSPP, 94, 5},
-	{ DBGBUS_DSPP, 94, 6},
-	{ DBGBUS_DSPP, 94, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 95, 1},
-	{ DBGBUS_DSPP, 95, 2},
-	{ DBGBUS_DSPP, 95, 3},
-	{ DBGBUS_DSPP, 95, 4},
-	{ DBGBUS_DSPP, 95, 5},
-	{ DBGBUS_DSPP, 95, 6},
-	{ DBGBUS_DSPP, 95, 7, _sde_debug_bus_lm_dump },
-
-
-	/* LM3 */
-	{ DBGBUS_DSPP, 110, 1},
-	{ DBGBUS_DSPP, 110, 2},
-	{ DBGBUS_DSPP, 110, 3},
-	{ DBGBUS_DSPP, 110, 4},
-	{ DBGBUS_DSPP, 110, 5},
-	{ DBGBUS_DSPP, 110, 6},
-	{ DBGBUS_DSPP, 110, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 111, 1},
-	{ DBGBUS_DSPP, 111, 2},
-	{ DBGBUS_DSPP, 111, 3},
-	{ DBGBUS_DSPP, 111, 4},
-	{ DBGBUS_DSPP, 111, 5},
-	{ DBGBUS_DSPP, 111, 6},
-	{ DBGBUS_DSPP, 111, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 112, 1},
-	{ DBGBUS_DSPP, 112, 2},
-	{ DBGBUS_DSPP, 112, 3},
-	{ DBGBUS_DSPP, 112, 4},
-	{ DBGBUS_DSPP, 112, 5},
-	{ DBGBUS_DSPP, 112, 6},
-	{ DBGBUS_DSPP, 112, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 113, 1},
-	{ DBGBUS_DSPP, 113, 2},
-	{ DBGBUS_DSPP, 113, 3},
-	{ DBGBUS_DSPP, 113, 4},
-	{ DBGBUS_DSPP, 113, 5},
-	{ DBGBUS_DSPP, 113, 6},
-	{ DBGBUS_DSPP, 113, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 114, 1},
-	{ DBGBUS_DSPP, 114, 2},
-	{ DBGBUS_DSPP, 114, 3},
-	{ DBGBUS_DSPP, 114, 4},
-	{ DBGBUS_DSPP, 114, 5},
-	{ DBGBUS_DSPP, 114, 6},
-	{ DBGBUS_DSPP, 114, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 115, 1},
-	{ DBGBUS_DSPP, 115, 2},
-	{ DBGBUS_DSPP, 115, 3},
-	{ DBGBUS_DSPP, 115, 4},
-	{ DBGBUS_DSPP, 115, 5},
-	{ DBGBUS_DSPP, 115, 6},
-	{ DBGBUS_DSPP, 115, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 116, 1},
-	{ DBGBUS_DSPP, 116, 2},
-	{ DBGBUS_DSPP, 116, 3},
-	{ DBGBUS_DSPP, 116, 4},
-	{ DBGBUS_DSPP, 116, 5},
-	{ DBGBUS_DSPP, 116, 6},
-	{ DBGBUS_DSPP, 116, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 117, 1},
-	{ DBGBUS_DSPP, 117, 2},
-	{ DBGBUS_DSPP, 117, 3},
-	{ DBGBUS_DSPP, 117, 4},
-	{ DBGBUS_DSPP, 117, 5},
-	{ DBGBUS_DSPP, 117, 6},
-	{ DBGBUS_DSPP, 117, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 118, 1},
-	{ DBGBUS_DSPP, 118, 2},
-	{ DBGBUS_DSPP, 118, 3},
-	{ DBGBUS_DSPP, 118, 4},
-	{ DBGBUS_DSPP, 118, 5},
-	{ DBGBUS_DSPP, 118, 6},
-	{ DBGBUS_DSPP, 118, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 119, 1},
-	{ DBGBUS_DSPP, 119, 2},
-	{ DBGBUS_DSPP, 119, 3},
-	{ DBGBUS_DSPP, 119, 4},
-	{ DBGBUS_DSPP, 119, 5},
-	{ DBGBUS_DSPP, 119, 6},
-	{ DBGBUS_DSPP, 119, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 120, 1},
-	{ DBGBUS_DSPP, 120, 2},
-	{ DBGBUS_DSPP, 120, 3},
-	{ DBGBUS_DSPP, 120, 4},
-	{ DBGBUS_DSPP, 120, 5},
-	{ DBGBUS_DSPP, 120, 6},
-	{ DBGBUS_DSPP, 120, 7, _sde_debug_bus_lm_dump },
-
-	/* LM4 */
-	{ DBGBUS_DSPP, 96, 1},
-	{ DBGBUS_DSPP, 96, 2},
-	{ DBGBUS_DSPP, 96, 3},
-	{ DBGBUS_DSPP, 96, 4},
-	{ DBGBUS_DSPP, 96, 5},
-	{ DBGBUS_DSPP, 96, 6},
-	{ DBGBUS_DSPP, 96, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 97, 1},
-	{ DBGBUS_DSPP, 97, 2},
-	{ DBGBUS_DSPP, 97, 3},
-	{ DBGBUS_DSPP, 97, 4},
-	{ DBGBUS_DSPP, 97, 5},
-	{ DBGBUS_DSPP, 97, 6},
-	{ DBGBUS_DSPP, 97, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 98, 1},
-	{ DBGBUS_DSPP, 98, 2},
-	{ DBGBUS_DSPP, 98, 3},
-	{ DBGBUS_DSPP, 98, 4},
-	{ DBGBUS_DSPP, 98, 5},
-	{ DBGBUS_DSPP, 98, 6},
-	{ DBGBUS_DSPP, 98, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 99, 1},
-	{ DBGBUS_DSPP, 99, 2},
-	{ DBGBUS_DSPP, 99, 3},
-	{ DBGBUS_DSPP, 99, 4},
-	{ DBGBUS_DSPP, 99, 5},
-	{ DBGBUS_DSPP, 99, 6},
-	{ DBGBUS_DSPP, 99, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 100, 1},
-	{ DBGBUS_DSPP, 100, 2},
-	{ DBGBUS_DSPP, 100, 3},
-	{ DBGBUS_DSPP, 100, 4},
-	{ DBGBUS_DSPP, 100, 5},
-	{ DBGBUS_DSPP, 100, 6},
-	{ DBGBUS_DSPP, 100, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 101, 1},
-	{ DBGBUS_DSPP, 101, 2},
-	{ DBGBUS_DSPP, 101, 3},
-	{ DBGBUS_DSPP, 101, 4},
-	{ DBGBUS_DSPP, 101, 5},
-	{ DBGBUS_DSPP, 101, 6},
-	{ DBGBUS_DSPP, 101, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 103, 1},
-	{ DBGBUS_DSPP, 103, 2},
-	{ DBGBUS_DSPP, 103, 3},
-	{ DBGBUS_DSPP, 103, 4},
-	{ DBGBUS_DSPP, 103, 5},
-	{ DBGBUS_DSPP, 103, 6},
-	{ DBGBUS_DSPP, 103, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 105, 1},
-	{ DBGBUS_DSPP, 105, 2},
-	{ DBGBUS_DSPP, 105, 3},
-	{ DBGBUS_DSPP, 105, 4},
-	{ DBGBUS_DSPP, 105, 5},
-	{ DBGBUS_DSPP, 105, 6},
-	{ DBGBUS_DSPP, 105, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 106, 1},
-	{ DBGBUS_DSPP, 106, 2},
-	{ DBGBUS_DSPP, 106, 3},
-	{ DBGBUS_DSPP, 106, 4},
-	{ DBGBUS_DSPP, 106, 5},
-	{ DBGBUS_DSPP, 106, 6},
-	{ DBGBUS_DSPP, 106, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 109, 1},
-	{ DBGBUS_DSPP, 109, 2},
-	{ DBGBUS_DSPP, 109, 3},
-	{ DBGBUS_DSPP, 109, 4},
-	{ DBGBUS_DSPP, 109, 5},
-	{ DBGBUS_DSPP, 109, 6},
-	{ DBGBUS_DSPP, 109, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 122, 1},
-	{ DBGBUS_DSPP, 122, 2},
-	{ DBGBUS_DSPP, 122, 3},
-	{ DBGBUS_DSPP, 122, 4},
-	{ DBGBUS_DSPP, 122, 5},
-	{ DBGBUS_DSPP, 122, 6},
-	{ DBGBUS_DSPP, 122, 7, _sde_debug_bus_lm_dump },
-
-	/* LM5 */
-	{ DBGBUS_DSPP, 124, 1},
-	{ DBGBUS_DSPP, 124, 2},
-	{ DBGBUS_DSPP, 124, 3},
-	{ DBGBUS_DSPP, 124, 4},
-	{ DBGBUS_DSPP, 124, 5},
-	{ DBGBUS_DSPP, 124, 6},
-	{ DBGBUS_DSPP, 124, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 125, 1},
-	{ DBGBUS_DSPP, 125, 2},
-	{ DBGBUS_DSPP, 125, 3},
-	{ DBGBUS_DSPP, 125, 4},
-	{ DBGBUS_DSPP, 125, 5},
-	{ DBGBUS_DSPP, 125, 6},
-	{ DBGBUS_DSPP, 125, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 126, 1},
-	{ DBGBUS_DSPP, 126, 2},
-	{ DBGBUS_DSPP, 126, 3},
-	{ DBGBUS_DSPP, 126, 4},
-	{ DBGBUS_DSPP, 126, 5},
-	{ DBGBUS_DSPP, 126, 6},
-	{ DBGBUS_DSPP, 126, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 127, 1},
-	{ DBGBUS_DSPP, 127, 2},
-	{ DBGBUS_DSPP, 127, 3},
-	{ DBGBUS_DSPP, 127, 4},
-	{ DBGBUS_DSPP, 127, 5},
-	{ DBGBUS_DSPP, 127, 6},
-	{ DBGBUS_DSPP, 127, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 128, 1},
-	{ DBGBUS_DSPP, 128, 2},
-	{ DBGBUS_DSPP, 128, 3},
-	{ DBGBUS_DSPP, 128, 4},
-	{ DBGBUS_DSPP, 128, 5},
-	{ DBGBUS_DSPP, 128, 6},
-	{ DBGBUS_DSPP, 128, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 129, 1},
-	{ DBGBUS_DSPP, 129, 2},
-	{ DBGBUS_DSPP, 129, 3},
-	{ DBGBUS_DSPP, 129, 4},
-	{ DBGBUS_DSPP, 129, 5},
-	{ DBGBUS_DSPP, 129, 6},
-	{ DBGBUS_DSPP, 129, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 131, 1},
-	{ DBGBUS_DSPP, 131, 2},
-	{ DBGBUS_DSPP, 131, 3},
-	{ DBGBUS_DSPP, 131, 4},
-	{ DBGBUS_DSPP, 131, 5},
-	{ DBGBUS_DSPP, 131, 6},
-	{ DBGBUS_DSPP, 131, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 132, 1},
-	{ DBGBUS_DSPP, 132, 2},
-	{ DBGBUS_DSPP, 132, 3},
-	{ DBGBUS_DSPP, 132, 4},
-	{ DBGBUS_DSPP, 132, 5},
-	{ DBGBUS_DSPP, 132, 6},
-	{ DBGBUS_DSPP, 132, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 133, 1},
-	{ DBGBUS_DSPP, 133, 2},
-	{ DBGBUS_DSPP, 133, 3},
-	{ DBGBUS_DSPP, 133, 4},
-	{ DBGBUS_DSPP, 133, 5},
-	{ DBGBUS_DSPP, 133, 6},
-	{ DBGBUS_DSPP, 133, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 134, 1},
-	{ DBGBUS_DSPP, 134, 2},
-	{ DBGBUS_DSPP, 134, 3},
-	{ DBGBUS_DSPP, 134, 4},
-	{ DBGBUS_DSPP, 134, 5},
-	{ DBGBUS_DSPP, 134, 6},
-	{ DBGBUS_DSPP, 134, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 135, 1},
-	{ DBGBUS_DSPP, 135, 2},
-	{ DBGBUS_DSPP, 135, 3},
-	{ DBGBUS_DSPP, 135, 4},
-	{ DBGBUS_DSPP, 135, 5},
-	{ DBGBUS_DSPP, 135, 6},
-	{ DBGBUS_DSPP, 135, 7, _sde_debug_bus_lm_dump },
-
-	/* csc */
-	{ DBGBUS_SSPP0, 7, 0},
-	{ DBGBUS_SSPP0, 7, 1},
-	{ DBGBUS_SSPP0, 7, 2},
-	{ DBGBUS_SSPP0, 27, 0},
-	{ DBGBUS_SSPP0, 27, 1},
-	{ DBGBUS_SSPP0, 27, 2},
-	{ DBGBUS_SSPP1, 7, 0},
-	{ DBGBUS_SSPP1, 7, 1},
-	{ DBGBUS_SSPP1, 7, 2},
-	{ DBGBUS_SSPP1, 27, 0},
-	{ DBGBUS_SSPP1, 27, 1},
-	{ DBGBUS_SSPP1, 27, 2},
-
-	/* pcc */
-	{ DBGBUS_SSPP0, 43, 3},
-	{ DBGBUS_SSPP0, 47, 3},
-	{ DBGBUS_SSPP1, 43, 3},
-	{ DBGBUS_SSPP1, 47, 3},
-
-	/* spa */
-	{ DBGBUS_SSPP0, 8,  0},
-	{ DBGBUS_SSPP0, 28, 0},
-	{ DBGBUS_SSPP1, 8,  0},
-	{ DBGBUS_SSPP1, 28, 0},
-
-	/* dspp pa */
-	{ DBGBUS_DSPP, 13, 0},
-	{ DBGBUS_DSPP, 19, 0},
-	{ DBGBUS_DSPP, 24, 0},
-	{ DBGBUS_DSPP, 37, 0},
-
-	/* igc */
-	{ DBGBUS_SSPP0, 39, 0},
-	{ DBGBUS_SSPP0, 39, 1},
-	{ DBGBUS_SSPP0, 39, 2},
-
-	{ DBGBUS_SSPP1, 39, 0},
-	{ DBGBUS_SSPP1, 39, 1},
-	{ DBGBUS_SSPP1, 39, 2},
-
-	{ DBGBUS_SSPP0, 46, 0},
-	{ DBGBUS_SSPP0, 46, 1},
-	{ DBGBUS_SSPP0, 46, 2},
-
-	{ DBGBUS_SSPP1, 46, 0},
-	{ DBGBUS_SSPP1, 46, 1},
-	{ DBGBUS_SSPP1, 46, 2},
-
-	{ DBGBUS_DSPP, 14, 0},
-	{ DBGBUS_DSPP, 14, 1},
-	{ DBGBUS_DSPP, 14, 2},
-	{ DBGBUS_DSPP, 20, 0},
-	{ DBGBUS_DSPP, 20, 1},
-	{ DBGBUS_DSPP, 20, 2},
-	{ DBGBUS_DSPP, 25, 0},
-	{ DBGBUS_DSPP, 25, 1},
-	{ DBGBUS_DSPP, 25, 2},
-	{ DBGBUS_DSPP, 38, 0},
-	{ DBGBUS_DSPP, 38, 1},
-	{ DBGBUS_DSPP, 38, 2},
-
-	/* intf0-3 */
-	{ DBGBUS_PERIPH, 0, 0},
-	{ DBGBUS_PERIPH, 1, 0},
-	{ DBGBUS_PERIPH, 2, 0},
-	{ DBGBUS_PERIPH, 3, 0},
-	{ DBGBUS_PERIPH, 4, 0},
-	{ DBGBUS_PERIPH, 5, 0},
-
-	/* te counter wrapper */
-	{ DBGBUS_PERIPH, 60, 0},
-	{ DBGBUS_PERIPH, 60, 1},
-	{ DBGBUS_PERIPH, 60, 2},
-	{ DBGBUS_PERIPH, 60, 3},
-	{ DBGBUS_PERIPH, 60, 4},
-	{ DBGBUS_PERIPH, 60, 5},
-
-	/* dsc0 */
-	{ DBGBUS_PERIPH, 47, 0},
-	{ DBGBUS_PERIPH, 47, 1},
-	{ DBGBUS_PERIPH, 47, 2},
-	{ DBGBUS_PERIPH, 47, 3},
-	{ DBGBUS_PERIPH, 47, 4},
-	{ DBGBUS_PERIPH, 47, 5},
-	{ DBGBUS_PERIPH, 47, 6},
-	{ DBGBUS_PERIPH, 47, 7},
-
-	/* dsc1 */
-	{ DBGBUS_PERIPH, 48, 0},
-	{ DBGBUS_PERIPH, 48, 1},
-	{ DBGBUS_PERIPH, 48, 2},
-	{ DBGBUS_PERIPH, 48, 3},
-	{ DBGBUS_PERIPH, 48, 4},
-	{ DBGBUS_PERIPH, 48, 5},
-	{ DBGBUS_PERIPH, 48, 6},
-	{ DBGBUS_PERIPH, 48, 7},
-
-	/* dsc2 */
-	{ DBGBUS_PERIPH, 50, 0},
-	{ DBGBUS_PERIPH, 50, 1},
-	{ DBGBUS_PERIPH, 50, 2},
-	{ DBGBUS_PERIPH, 50, 3},
-	{ DBGBUS_PERIPH, 50, 4},
-	{ DBGBUS_PERIPH, 50, 5},
-	{ DBGBUS_PERIPH, 50, 6},
-	{ DBGBUS_PERIPH, 50, 7},
-
-	/* dsc3 */
-	{ DBGBUS_PERIPH, 51, 0},
-	{ DBGBUS_PERIPH, 51, 1},
-	{ DBGBUS_PERIPH, 51, 2},
-	{ DBGBUS_PERIPH, 51, 3},
-	{ DBGBUS_PERIPH, 51, 4},
-	{ DBGBUS_PERIPH, 51, 5},
-	{ DBGBUS_PERIPH, 51, 6},
-	{ DBGBUS_PERIPH, 51, 7},
-
-	/* dsc4 */
-	{ DBGBUS_PERIPH, 52, 0},
-	{ DBGBUS_PERIPH, 52, 1},
-	{ DBGBUS_PERIPH, 52, 2},
-	{ DBGBUS_PERIPH, 52, 3},
-	{ DBGBUS_PERIPH, 52, 4},
-	{ DBGBUS_PERIPH, 52, 5},
-	{ DBGBUS_PERIPH, 52, 6},
-	{ DBGBUS_PERIPH, 52, 7},
-
-	/* dsc5 */
-	{ DBGBUS_PERIPH, 53, 0},
-	{ DBGBUS_PERIPH, 53, 1},
-	{ DBGBUS_PERIPH, 53, 2},
-	{ DBGBUS_PERIPH, 53, 3},
-	{ DBGBUS_PERIPH, 53, 4},
-	{ DBGBUS_PERIPH, 53, 5},
-	{ DBGBUS_PERIPH, 53, 6},
-	{ DBGBUS_PERIPH, 53, 7},
-
-	/* tear-check */
-	/* INTF_0 */
-	{ DBGBUS_PERIPH, 63, 0 },
-	{ DBGBUS_PERIPH, 63, 1 },
-	{ DBGBUS_PERIPH, 63, 2 },
-	{ DBGBUS_PERIPH, 63, 3 },
-	{ DBGBUS_PERIPH, 63, 4 },
-	{ DBGBUS_PERIPH, 63, 5 },
-	{ DBGBUS_PERIPH, 63, 6 },
-	{ DBGBUS_PERIPH, 63, 7 },
-
-	/* INTF_1 */
-	{ DBGBUS_PERIPH, 64, 0 },
-	{ DBGBUS_PERIPH, 64, 1 },
-	{ DBGBUS_PERIPH, 64, 2 },
-	{ DBGBUS_PERIPH, 64, 3 },
-	{ DBGBUS_PERIPH, 64, 4 },
-	{ DBGBUS_PERIPH, 64, 5 },
-	{ DBGBUS_PERIPH, 64, 6 },
-	{ DBGBUS_PERIPH, 64, 7 },
-
-	/* INTF_2 */
-	{ DBGBUS_PERIPH, 65, 0 },
-	{ DBGBUS_PERIPH, 65, 1 },
-	{ DBGBUS_PERIPH, 65, 2 },
-	{ DBGBUS_PERIPH, 65, 3 },
-	{ DBGBUS_PERIPH, 65, 4 },
-	{ DBGBUS_PERIPH, 65, 5 },
-	{ DBGBUS_PERIPH, 65, 6 },
-	{ DBGBUS_PERIPH, 65, 7 },
-
-	/* INTF_4 */
-	{ DBGBUS_PERIPH, 66, 0 },
-	{ DBGBUS_PERIPH, 66, 1 },
-	{ DBGBUS_PERIPH, 66, 2 },
-	{ DBGBUS_PERIPH, 66, 3 },
-	{ DBGBUS_PERIPH, 66, 4 },
-	{ DBGBUS_PERIPH, 66, 5 },
-	{ DBGBUS_PERIPH, 66, 6 },
-	{ DBGBUS_PERIPH, 66, 7 },
-
-	/* INTF_5 */
-	{ DBGBUS_PERIPH, 67, 0 },
-	{ DBGBUS_PERIPH, 67, 1 },
-	{ DBGBUS_PERIPH, 67, 2 },
-	{ DBGBUS_PERIPH, 67, 3 },
-	{ DBGBUS_PERIPH, 67, 4 },
-	{ DBGBUS_PERIPH, 67, 5 },
-	{ DBGBUS_PERIPH, 67, 6 },
-	{ DBGBUS_PERIPH, 67, 7 },
-
-	/* INTF_3 */
-	{ DBGBUS_PERIPH, 73, 0 },
-	{ DBGBUS_PERIPH, 73, 1 },
-	{ DBGBUS_PERIPH, 73, 2 },
-	{ DBGBUS_PERIPH, 73, 3 },
-	{ DBGBUS_PERIPH, 73, 4 },
-	{ DBGBUS_PERIPH, 73, 5 },
-	{ DBGBUS_PERIPH, 73, 6 },
-	{ DBGBUS_PERIPH, 73, 7 },
-
-	/* cdwn */
-	{ DBGBUS_PERIPH, 80, 0},
-	{ DBGBUS_PERIPH, 80, 1},
-	{ DBGBUS_PERIPH, 80, 2},
-
-	{ DBGBUS_PERIPH, 81, 0},
-	{ DBGBUS_PERIPH, 81, 1},
-	{ DBGBUS_PERIPH, 81, 2},
-
-	{ DBGBUS_PERIPH, 82, 0},
-	{ DBGBUS_PERIPH, 82, 1},
-	{ DBGBUS_PERIPH, 82, 2},
-	{ DBGBUS_PERIPH, 82, 3},
-	{ DBGBUS_PERIPH, 82, 4},
-	{ DBGBUS_PERIPH, 82, 5},
-	{ DBGBUS_PERIPH, 82, 6},
-	{ DBGBUS_PERIPH, 82, 7},
-
-	/* DPTX1 */
-	{ DBGBUS_PERIPH, 68, 0},
-	{ DBGBUS_PERIPH, 68, 1},
-	{ DBGBUS_PERIPH, 68, 2},
-	{ DBGBUS_PERIPH, 68, 3},
-	{ DBGBUS_PERIPH, 68, 4},
-	{ DBGBUS_PERIPH, 68, 5},
-	{ DBGBUS_PERIPH, 68, 6},
-	{ DBGBUS_PERIPH, 68, 7},
-
-	/* DP */
-	{ DBGBUS_PERIPH, 69, 0},
-	{ DBGBUS_PERIPH, 69, 1},
-	{ DBGBUS_PERIPH, 69, 2},
-	{ DBGBUS_PERIPH, 69, 3},
-	{ DBGBUS_PERIPH, 69, 4},
-	{ DBGBUS_PERIPH, 69, 5},
-
-	/* dsi0 */
-	{ DBGBUS_PERIPH, 70, 0},
-	{ DBGBUS_PERIPH, 70, 1},
-	{ DBGBUS_PERIPH, 70, 2},
-	{ DBGBUS_PERIPH, 70, 3},
-	{ DBGBUS_PERIPH, 70, 4},
-	{ DBGBUS_PERIPH, 70, 5},
-
-	/* dsi1 */
-	{ DBGBUS_PERIPH, 71, 0},
-	{ DBGBUS_PERIPH, 71, 1},
-	{ DBGBUS_PERIPH, 71, 2},
-	{ DBGBUS_PERIPH, 71, 3},
-	{ DBGBUS_PERIPH, 71, 4},
-	{ DBGBUS_PERIPH, 71, 5},
-
-	/* eDP */
-	{ DBGBUS_PERIPH, 72, 0},
-	{ DBGBUS_PERIPH, 72, 1},
-	{ DBGBUS_PERIPH, 72, 2},
-	{ DBGBUS_PERIPH, 72, 3},
-	{ DBGBUS_PERIPH, 72, 4},
-	{ DBGBUS_PERIPH, 72, 5},
+	{ DBGBUS_DSPP, 63, 1, 7, 1, _sde_debug_bus_lm_dump },
+	{ DBGBUS_DSPP, 70, 1, 7, 1, _sde_debug_bus_lm_dump },
+	{ DBGBUS_DSPP, 77, 1, 7, 1, _sde_debug_bus_lm_dump },
+	{ DBGBUS_DSPP, 110, 1, 7, 1, _sde_debug_bus_lm_dump },
+	{ DBGBUS_DSPP, 96, 1, 7, 1, _sde_debug_bus_lm_dump },
+	{ DBGBUS_DSPP, 124, 1, 7, 1, _sde_debug_bus_lm_dump }
 
 };
 
-static struct sde_debug_bus_entry dbg_bus_sde_kona[] = {
-
-	/* Unpack 0 sspp 0*/
-	{ DBGBUS_SSPP0, 35, 2 },
-	{ DBGBUS_SSPP0, 50, 2 },
-	{ DBGBUS_SSPP0, 60, 2 },
-	{ DBGBUS_SSPP0, 70, 2 },
-
-	/* Unpack 1 sspp 0*/
-	{ DBGBUS_SSPP0, 36, 2 },
-	{ DBGBUS_SSPP0, 51, 2 },
-	{ DBGBUS_SSPP0, 61, 2 },
-	{ DBGBUS_SSPP0, 71, 2 },
-
-	/* Unpack 2 sspp 0*/
-	{ DBGBUS_SSPP0, 37, 2 },
-	{ DBGBUS_SSPP0, 52, 2 },
-	{ DBGBUS_SSPP0, 62, 2 },
-	{ DBGBUS_SSPP0, 72, 2 },
-
-
-	/* Unpack 3 sspp 0*/
-	{ DBGBUS_SSPP0, 38, 2 },
-	{ DBGBUS_SSPP0, 53, 2 },
-	{ DBGBUS_SSPP0, 63, 2 },
-	{ DBGBUS_SSPP0, 73, 2 },
-
-	/* Unpack 0 sspp 1*/
-	{ DBGBUS_SSPP1, 35, 2 },
-	{ DBGBUS_SSPP1, 50, 2 },
-	{ DBGBUS_SSPP1, 60, 2 },
-	{ DBGBUS_SSPP1, 70, 2 },
-
-	/* Unpack 1 sspp 1*/
-	{ DBGBUS_SSPP1, 36, 2 },
-	{ DBGBUS_SSPP1, 51, 2 },
-	{ DBGBUS_SSPP1, 61, 2 },
-	{ DBGBUS_SSPP1, 71, 2 },
-
-	/* Unpack 2 sspp 1*/
-	{ DBGBUS_SSPP1, 37, 2 },
-	{ DBGBUS_SSPP1, 52, 2 },
-	{ DBGBUS_SSPP1, 62, 2 },
-	{ DBGBUS_SSPP1, 72, 2 },
-
-
-	/* Unpack 3 sspp 1*/
-	{ DBGBUS_SSPP1, 38, 2 },
-	{ DBGBUS_SSPP1, 53, 2 },
-	{ DBGBUS_SSPP1, 63, 2 },
-	{ DBGBUS_SSPP1, 73, 2 },
-
-	/* scheduler */
-	{ DBGBUS_DSPP, 130, 0 },
-	{ DBGBUS_DSPP, 130, 1 },
-	{ DBGBUS_DSPP, 130, 2 },
-	{ DBGBUS_DSPP, 130, 3 },
-	{ DBGBUS_DSPP, 130, 4 },
-	{ DBGBUS_DSPP, 130, 5 },
-
-
-	/* fetch sspp0 */
-
-	/* vig 0 */
-	{ DBGBUS_SSPP0, 0, 0 },
-	{ DBGBUS_SSPP0, 0, 1 },
-	{ DBGBUS_SSPP0, 0, 2 },
-	{ DBGBUS_SSPP0, 0, 3 },
-	{ DBGBUS_SSPP0, 0, 4 },
-	{ DBGBUS_SSPP0, 0, 5 },
-	{ DBGBUS_SSPP0, 0, 6 },
-	{ DBGBUS_SSPP0, 0, 7 },
-
-	{ DBGBUS_SSPP0, 1, 0 },
-	{ DBGBUS_SSPP0, 1, 1 },
-	{ DBGBUS_SSPP0, 1, 2 },
-	{ DBGBUS_SSPP0, 1, 3 },
-	{ DBGBUS_SSPP0, 1, 4 },
-	{ DBGBUS_SSPP0, 1, 5 },
-	{ DBGBUS_SSPP0, 1, 6 },
-	{ DBGBUS_SSPP0, 1, 7 },
-
-	{ DBGBUS_SSPP0, 2, 0 },
-	{ DBGBUS_SSPP0, 2, 1 },
-	{ DBGBUS_SSPP0, 2, 2 },
-	{ DBGBUS_SSPP0, 2, 3 },
-	{ DBGBUS_SSPP0, 2, 4 },
-	{ DBGBUS_SSPP0, 2, 5 },
-	{ DBGBUS_SSPP0, 2, 6 },
-	{ DBGBUS_SSPP0, 2, 7 },
-
-	{ DBGBUS_SSPP0, 4, 0 },
-	{ DBGBUS_SSPP0, 4, 1 },
-	{ DBGBUS_SSPP0, 4, 2 },
-	{ DBGBUS_SSPP0, 4, 3 },
-	{ DBGBUS_SSPP0, 4, 4 },
-	{ DBGBUS_SSPP0, 4, 5 },
-	{ DBGBUS_SSPP0, 4, 6 },
-	{ DBGBUS_SSPP0, 4, 7 },
-
-	{ DBGBUS_SSPP0, 5, 0 },
-	{ DBGBUS_SSPP0, 5, 1 },
-	{ DBGBUS_SSPP0, 5, 2 },
-	{ DBGBUS_SSPP0, 5, 3 },
-	{ DBGBUS_SSPP0, 5, 4 },
-	{ DBGBUS_SSPP0, 5, 5 },
-	{ DBGBUS_SSPP0, 5, 6 },
-	{ DBGBUS_SSPP0, 5, 7 },
-
-	/* vig 2 */
-	{ DBGBUS_SSPP0, 20, 0 },
-	{ DBGBUS_SSPP0, 20, 1 },
-	{ DBGBUS_SSPP0, 20, 2 },
-	{ DBGBUS_SSPP0, 20, 3 },
-	{ DBGBUS_SSPP0, 20, 4 },
-	{ DBGBUS_SSPP0, 20, 5 },
-	{ DBGBUS_SSPP0, 20, 6 },
-	{ DBGBUS_SSPP0, 20, 7 },
-
-	{ DBGBUS_SSPP0, 21, 0 },
-	{ DBGBUS_SSPP0, 21, 1 },
-	{ DBGBUS_SSPP0, 21, 2 },
-	{ DBGBUS_SSPP0, 21, 3 },
-	{ DBGBUS_SSPP0, 21, 4 },
-	{ DBGBUS_SSPP0, 21, 5 },
-	{ DBGBUS_SSPP0, 21, 6 },
-	{ DBGBUS_SSPP0, 21, 7 },
-
-	{ DBGBUS_SSPP0, 22, 0 },
-	{ DBGBUS_SSPP0, 22, 1 },
-	{ DBGBUS_SSPP0, 22, 2 },
-	{ DBGBUS_SSPP0, 22, 3 },
-	{ DBGBUS_SSPP0, 22, 4 },
-	{ DBGBUS_SSPP0, 22, 5 },
-	{ DBGBUS_SSPP0, 22, 6 },
-	{ DBGBUS_SSPP0, 22, 7 },
-
-	{ DBGBUS_SSPP0, 24, 0 },
-	{ DBGBUS_SSPP0, 24, 1 },
-	{ DBGBUS_SSPP0, 24, 2 },
-	{ DBGBUS_SSPP0, 24, 3 },
-	{ DBGBUS_SSPP0, 24, 4 },
-	{ DBGBUS_SSPP0, 24, 5 },
-	{ DBGBUS_SSPP0, 24, 6 },
-	{ DBGBUS_SSPP0, 24, 7 },
-
-	{ DBGBUS_SSPP0, 25, 0 },
-	{ DBGBUS_SSPP0, 25, 1 },
-	{ DBGBUS_SSPP0, 25, 2 },
-	{ DBGBUS_SSPP0, 25, 3 },
-	{ DBGBUS_SSPP0, 25, 4 },
-	{ DBGBUS_SSPP0, 25, 5 },
-	{ DBGBUS_SSPP0, 25, 6 },
-	{ DBGBUS_SSPP0, 25, 7 },
-
-	/* dma 2 */
-	{ DBGBUS_SSPP0, 30, 0 },
-	{ DBGBUS_SSPP0, 30, 1 },
-	{ DBGBUS_SSPP0, 30, 2 },
-	{ DBGBUS_SSPP0, 30, 3 },
-	{ DBGBUS_SSPP0, 30, 4 },
-	{ DBGBUS_SSPP0, 30, 5 },
-	{ DBGBUS_SSPP0, 30, 6 },
-	{ DBGBUS_SSPP0, 30, 7 },
-
-	{ DBGBUS_SSPP0, 31, 0 },
-	{ DBGBUS_SSPP0, 31, 1 },
-	{ DBGBUS_SSPP0, 31, 2 },
-	{ DBGBUS_SSPP0, 31, 3 },
-	{ DBGBUS_SSPP0, 31, 4 },
-	{ DBGBUS_SSPP0, 31, 5 },
-	{ DBGBUS_SSPP0, 31, 6 },
-	{ DBGBUS_SSPP0, 31, 7 },
-
-	{ DBGBUS_SSPP0, 32, 0 },
-	{ DBGBUS_SSPP0, 32, 1 },
-	{ DBGBUS_SSPP0, 32, 2 },
-	{ DBGBUS_SSPP0, 32, 3 },
-	{ DBGBUS_SSPP0, 32, 4 },
-	{ DBGBUS_SSPP0, 32, 5 },
-	{ DBGBUS_SSPP0, 32, 6 },
-	{ DBGBUS_SSPP0, 32, 7 },
-
-	{ DBGBUS_SSPP0, 33, 0 },
-	{ DBGBUS_SSPP0, 33, 1 },
-	{ DBGBUS_SSPP0, 33, 2 },
-	{ DBGBUS_SSPP0, 33, 3 },
-	{ DBGBUS_SSPP0, 33, 4 },
-	{ DBGBUS_SSPP0, 33, 5 },
-	{ DBGBUS_SSPP0, 33, 6 },
-	{ DBGBUS_SSPP0, 33, 7 },
-
-	{ DBGBUS_SSPP0, 34, 0 },
-	{ DBGBUS_SSPP0, 34, 1 },
-	{ DBGBUS_SSPP0, 34, 2 },
-	{ DBGBUS_SSPP0, 34, 3 },
-	{ DBGBUS_SSPP0, 34, 4 },
-	{ DBGBUS_SSPP0, 34, 5 },
-	{ DBGBUS_SSPP0, 34, 6 },
-	{ DBGBUS_SSPP0, 34, 7 },
-
-	/* dma 0 */
-	{ DBGBUS_SSPP0, 40, 0 },
-	{ DBGBUS_SSPP0, 40, 1 },
-	{ DBGBUS_SSPP0, 40, 2 },
-	{ DBGBUS_SSPP0, 40, 3 },
-	{ DBGBUS_SSPP0, 40, 4 },
-	{ DBGBUS_SSPP0, 40, 5 },
-	{ DBGBUS_SSPP0, 40, 6 },
-	{ DBGBUS_SSPP0, 40, 7 },
-
-	{ DBGBUS_SSPP0, 41, 0 },
-	{ DBGBUS_SSPP0, 41, 1 },
-	{ DBGBUS_SSPP0, 41, 2 },
-	{ DBGBUS_SSPP0, 41, 3 },
-	{ DBGBUS_SSPP0, 41, 4 },
-	{ DBGBUS_SSPP0, 41, 5 },
-	{ DBGBUS_SSPP0, 41, 6 },
-	{ DBGBUS_SSPP0, 41, 7 },
-
-	{ DBGBUS_SSPP0, 42, 0 },
-	{ DBGBUS_SSPP0, 42, 1 },
-	{ DBGBUS_SSPP0, 42, 2 },
-	{ DBGBUS_SSPP0, 42, 3 },
-	{ DBGBUS_SSPP0, 42, 4 },
-	{ DBGBUS_SSPP0, 42, 5 },
-	{ DBGBUS_SSPP0, 42, 6 },
-	{ DBGBUS_SSPP0, 42, 7 },
-
-	{ DBGBUS_SSPP0, 44, 0 },
-	{ DBGBUS_SSPP0, 44, 1 },
-	{ DBGBUS_SSPP0, 44, 2 },
-	{ DBGBUS_SSPP0, 44, 3 },
-	{ DBGBUS_SSPP0, 44, 4 },
-	{ DBGBUS_SSPP0, 44, 5 },
-	{ DBGBUS_SSPP0, 44, 6 },
-	{ DBGBUS_SSPP0, 44, 7 },
-
-	{ DBGBUS_SSPP0, 45, 0 },
-	{ DBGBUS_SSPP0, 45, 1 },
-	{ DBGBUS_SSPP0, 45, 2 },
-	{ DBGBUS_SSPP0, 45, 3 },
-	{ DBGBUS_SSPP0, 45, 4 },
-	{ DBGBUS_SSPP0, 45, 5 },
-	{ DBGBUS_SSPP0, 45, 6 },
-	{ DBGBUS_SSPP0, 45, 7 },
-
-	/* fetch sspp1 */
-	/* vig 1 */
-	{ DBGBUS_SSPP1, 0, 0 },
-	{ DBGBUS_SSPP1, 0, 1 },
-	{ DBGBUS_SSPP1, 0, 2 },
-	{ DBGBUS_SSPP1, 0, 3 },
-	{ DBGBUS_SSPP1, 0, 4 },
-	{ DBGBUS_SSPP1, 0, 5 },
-	{ DBGBUS_SSPP1, 0, 6 },
-	{ DBGBUS_SSPP1, 0, 7 },
-
-	{ DBGBUS_SSPP1, 1, 0 },
-	{ DBGBUS_SSPP1, 1, 1 },
-	{ DBGBUS_SSPP1, 1, 2 },
-	{ DBGBUS_SSPP1, 1, 3 },
-	{ DBGBUS_SSPP1, 1, 4 },
-	{ DBGBUS_SSPP1, 1, 5 },
-	{ DBGBUS_SSPP1, 1, 6 },
-	{ DBGBUS_SSPP1, 1, 7 },
-
-	{ DBGBUS_SSPP1, 2, 0 },
-	{ DBGBUS_SSPP1, 2, 1 },
-	{ DBGBUS_SSPP1, 2, 2 },
-	{ DBGBUS_SSPP1, 2, 3 },
-	{ DBGBUS_SSPP1, 2, 4 },
-	{ DBGBUS_SSPP1, 2, 5 },
-	{ DBGBUS_SSPP1, 2, 6 },
-	{ DBGBUS_SSPP1, 2, 7 },
-
-	{ DBGBUS_SSPP1, 4, 0 },
-	{ DBGBUS_SSPP1, 4, 1 },
-	{ DBGBUS_SSPP1, 4, 2 },
-	{ DBGBUS_SSPP1, 4, 3 },
-	{ DBGBUS_SSPP1, 4, 4 },
-	{ DBGBUS_SSPP1, 4, 5 },
-	{ DBGBUS_SSPP1, 4, 6 },
-	{ DBGBUS_SSPP1, 4, 7 },
-
-	{ DBGBUS_SSPP1, 5, 0 },
-	{ DBGBUS_SSPP1, 5, 1 },
-	{ DBGBUS_SSPP1, 5, 2 },
-	{ DBGBUS_SSPP1, 5, 3 },
-	{ DBGBUS_SSPP1, 5, 4 },
-	{ DBGBUS_SSPP1, 5, 5 },
-	{ DBGBUS_SSPP1, 5, 6 },
-	{ DBGBUS_SSPP1, 5, 7 },
-
-	/* vig 3 */
-	{ DBGBUS_SSPP1, 20, 0 },
-	{ DBGBUS_SSPP1, 20, 1 },
-	{ DBGBUS_SSPP1, 20, 2 },
-	{ DBGBUS_SSPP1, 20, 3 },
-	{ DBGBUS_SSPP1, 20, 4 },
-	{ DBGBUS_SSPP1, 20, 5 },
-	{ DBGBUS_SSPP1, 20, 6 },
-	{ DBGBUS_SSPP1, 20, 7 },
-
-	{ DBGBUS_SSPP1, 21, 0 },
-	{ DBGBUS_SSPP1, 21, 1 },
-	{ DBGBUS_SSPP1, 21, 2 },
-	{ DBGBUS_SSPP1, 21, 3 },
-	{ DBGBUS_SSPP1, 21, 4 },
-	{ DBGBUS_SSPP1, 21, 5 },
-	{ DBGBUS_SSPP1, 21, 6 },
-	{ DBGBUS_SSPP1, 21, 7 },
-
-	{ DBGBUS_SSPP1, 22, 0 },
-	{ DBGBUS_SSPP1, 22, 1 },
-	{ DBGBUS_SSPP1, 22, 2 },
-	{ DBGBUS_SSPP1, 22, 3 },
-	{ DBGBUS_SSPP1, 22, 4 },
-	{ DBGBUS_SSPP1, 22, 5 },
-	{ DBGBUS_SSPP1, 22, 6 },
-	{ DBGBUS_SSPP1, 22, 7 },
-
-	{ DBGBUS_SSPP1, 24, 0 },
-	{ DBGBUS_SSPP1, 24, 1 },
-	{ DBGBUS_SSPP1, 24, 2 },
-	{ DBGBUS_SSPP1, 24, 3 },
-	{ DBGBUS_SSPP1, 24, 4 },
-	{ DBGBUS_SSPP1, 24, 5 },
-	{ DBGBUS_SSPP1, 24, 6 },
-	{ DBGBUS_SSPP1, 24, 7 },
-
-	{ DBGBUS_SSPP1, 25, 0 },
-	{ DBGBUS_SSPP1, 25, 1 },
-	{ DBGBUS_SSPP1, 25, 2 },
-	{ DBGBUS_SSPP1, 25, 3 },
-	{ DBGBUS_SSPP1, 25, 4 },
-	{ DBGBUS_SSPP1, 25, 5 },
-	{ DBGBUS_SSPP1, 25, 6 },
-	{ DBGBUS_SSPP1, 25, 7 },
-
-	/* dma 3 */
-	{ DBGBUS_SSPP1, 30, 0 },
-	{ DBGBUS_SSPP1, 30, 1 },
-	{ DBGBUS_SSPP1, 30, 2 },
-	{ DBGBUS_SSPP1, 30, 3 },
-	{ DBGBUS_SSPP1, 30, 4 },
-	{ DBGBUS_SSPP1, 30, 5 },
-	{ DBGBUS_SSPP1, 30, 6 },
-	{ DBGBUS_SSPP1, 30, 7 },
-
-	{ DBGBUS_SSPP1, 31, 0 },
-	{ DBGBUS_SSPP1, 31, 1 },
-	{ DBGBUS_SSPP1, 31, 2 },
-	{ DBGBUS_SSPP1, 31, 3 },
-	{ DBGBUS_SSPP1, 31, 4 },
-	{ DBGBUS_SSPP1, 31, 5 },
-	{ DBGBUS_SSPP1, 31, 6 },
-	{ DBGBUS_SSPP1, 31, 7 },
-
-	{ DBGBUS_SSPP1, 32, 0 },
-	{ DBGBUS_SSPP1, 32, 1 },
-	{ DBGBUS_SSPP1, 32, 2 },
-	{ DBGBUS_SSPP1, 32, 3 },
-	{ DBGBUS_SSPP1, 32, 4 },
-	{ DBGBUS_SSPP1, 32, 5 },
-	{ DBGBUS_SSPP1, 32, 6 },
-	{ DBGBUS_SSPP1, 32, 7 },
-
-	{ DBGBUS_SSPP1, 33, 0 },
-	{ DBGBUS_SSPP1, 33, 1 },
-	{ DBGBUS_SSPP1, 33, 2 },
-	{ DBGBUS_SSPP1, 33, 3 },
-	{ DBGBUS_SSPP1, 33, 4 },
-	{ DBGBUS_SSPP1, 33, 5 },
-	{ DBGBUS_SSPP1, 33, 6 },
-	{ DBGBUS_SSPP1, 33, 7 },
-
-	{ DBGBUS_SSPP1, 34, 0 },
-	{ DBGBUS_SSPP1, 34, 1 },
-	{ DBGBUS_SSPP1, 34, 2 },
-	{ DBGBUS_SSPP1, 34, 3 },
-	{ DBGBUS_SSPP1, 34, 4 },
-	{ DBGBUS_SSPP1, 34, 5 },
-	{ DBGBUS_SSPP1, 34, 6 },
-	{ DBGBUS_SSPP1, 34, 7 },
-
-	/* dma 1 */
-	{ DBGBUS_SSPP1, 40, 0 },
-	{ DBGBUS_SSPP1, 40, 1 },
-	{ DBGBUS_SSPP1, 40, 2 },
-	{ DBGBUS_SSPP1, 40, 3 },
-	{ DBGBUS_SSPP1, 40, 4 },
-	{ DBGBUS_SSPP1, 40, 5 },
-	{ DBGBUS_SSPP1, 40, 6 },
-	{ DBGBUS_SSPP1, 40, 7 },
-
-	{ DBGBUS_SSPP1, 41, 0 },
-	{ DBGBUS_SSPP1, 41, 1 },
-	{ DBGBUS_SSPP1, 41, 2 },
-	{ DBGBUS_SSPP1, 41, 3 },
-	{ DBGBUS_SSPP1, 41, 4 },
-	{ DBGBUS_SSPP1, 41, 5 },
-	{ DBGBUS_SSPP1, 41, 6 },
-	{ DBGBUS_SSPP1, 41, 7 },
-
-	{ DBGBUS_SSPP1, 42, 0 },
-	{ DBGBUS_SSPP1, 42, 1 },
-	{ DBGBUS_SSPP1, 42, 2 },
-	{ DBGBUS_SSPP1, 42, 3 },
-	{ DBGBUS_SSPP1, 42, 4 },
-	{ DBGBUS_SSPP1, 42, 5 },
-	{ DBGBUS_SSPP1, 42, 6 },
-	{ DBGBUS_SSPP1, 42, 7 },
-
-	{ DBGBUS_SSPP1, 44, 0 },
-	{ DBGBUS_SSPP1, 44, 1 },
-	{ DBGBUS_SSPP1, 44, 2 },
-	{ DBGBUS_SSPP1, 44, 3 },
-	{ DBGBUS_SSPP1, 44, 4 },
-	{ DBGBUS_SSPP1, 44, 5 },
-	{ DBGBUS_SSPP1, 44, 6 },
-	{ DBGBUS_SSPP1, 44, 7 },
-
-	{ DBGBUS_SSPP1, 45, 0 },
-	{ DBGBUS_SSPP1, 45, 1 },
-	{ DBGBUS_SSPP1, 45, 2 },
-	{ DBGBUS_SSPP1, 45, 3 },
-	{ DBGBUS_SSPP1, 45, 4 },
-	{ DBGBUS_SSPP1, 45, 5 },
-	{ DBGBUS_SSPP1, 45, 6 },
-	{ DBGBUS_SSPP1, 45, 7 },
-
-	/* ppb_0 */
-	{ DBGBUS_DSPP, 31, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 33, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 35, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 42, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 47, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 49, 0, _sde_debug_bus_ppb0_dump },
-
-	/* ppb_1 */
-	{ DBGBUS_DSPP, 32, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 34, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 36, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 43, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 48, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 50, 0, _sde_debug_bus_ppb1_dump },
-
-	/* crossbar */
-	{ DBGBUS_DSPP, 0, 0, _sde_debug_bus_xbar_dump },
-
-	/* rotator */
-	{ DBGBUS_DSPP, 9, 0},
-
-	/* ltm */
-	{ DBGBUS_DSPP, 45, 0, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 1, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 2, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 3, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 4, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 5, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 6, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 7, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 8, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 9, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 10, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 11, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 12, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 13, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 14, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 15, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 16, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 17, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 18, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 45, 31, _sde_debug_bus_ltm_dump},
-
-	{ DBGBUS_DSPP, 46, 0, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 1, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 2, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 3, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 4, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 5, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 6, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 7, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 8, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 9, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 10, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 11, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 12, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 13, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 14, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 15, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 16, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 17, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 18, _sde_debug_bus_ltm_dump},
-	{ DBGBUS_DSPP, 46, 31, _sde_debug_bus_ltm_dump},
-
-	/* blend */
-	/* LM0 */
-	{ DBGBUS_DSPP, 63, 1},
-	{ DBGBUS_DSPP, 63, 2},
-	{ DBGBUS_DSPP, 63, 3},
-	{ DBGBUS_DSPP, 63, 4},
-	{ DBGBUS_DSPP, 63, 5},
-	{ DBGBUS_DSPP, 63, 6},
-	{ DBGBUS_DSPP, 63, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 64, 1},
-	{ DBGBUS_DSPP, 64, 2},
-	{ DBGBUS_DSPP, 64, 3},
-	{ DBGBUS_DSPP, 64, 4},
-	{ DBGBUS_DSPP, 64, 5},
-	{ DBGBUS_DSPP, 64, 6},
-	{ DBGBUS_DSPP, 64, 7},
-
-	{ DBGBUS_DSPP, 65, 1},
-	{ DBGBUS_DSPP, 65, 2},
-	{ DBGBUS_DSPP, 65, 3},
-	{ DBGBUS_DSPP, 65, 4},
-	{ DBGBUS_DSPP, 65, 5},
-	{ DBGBUS_DSPP, 65, 6},
-	{ DBGBUS_DSPP, 65, 7},
-
-	{ DBGBUS_DSPP, 66, 1},
-	{ DBGBUS_DSPP, 66, 2},
-	{ DBGBUS_DSPP, 66, 3},
-	{ DBGBUS_DSPP, 66, 4},
-	{ DBGBUS_DSPP, 66, 5},
-	{ DBGBUS_DSPP, 66, 6},
-	{ DBGBUS_DSPP, 66, 7},
-
-	{ DBGBUS_DSPP, 67, 1},
-	{ DBGBUS_DSPP, 67, 2},
-	{ DBGBUS_DSPP, 67, 3},
-	{ DBGBUS_DSPP, 67, 4},
-	{ DBGBUS_DSPP, 67, 5},
-	{ DBGBUS_DSPP, 67, 6},
-	{ DBGBUS_DSPP, 67, 7},
-
-	{ DBGBUS_DSPP, 68, 1},
-	{ DBGBUS_DSPP, 68, 2},
-	{ DBGBUS_DSPP, 68, 3},
-	{ DBGBUS_DSPP, 68, 4},
-	{ DBGBUS_DSPP, 68, 5},
-	{ DBGBUS_DSPP, 68, 6},
-	{ DBGBUS_DSPP, 68, 7},
-
-	{ DBGBUS_DSPP, 69, 1},
-	{ DBGBUS_DSPP, 69, 2},
-	{ DBGBUS_DSPP, 69, 3},
-	{ DBGBUS_DSPP, 69, 4},
-	{ DBGBUS_DSPP, 69, 5},
-	{ DBGBUS_DSPP, 69, 6},
-	{ DBGBUS_DSPP, 69, 7},
-
-	{ DBGBUS_DSPP, 84, 1},
-	{ DBGBUS_DSPP, 84, 2},
-	{ DBGBUS_DSPP, 84, 3},
-	{ DBGBUS_DSPP, 84, 4},
-	{ DBGBUS_DSPP, 84, 5},
-	{ DBGBUS_DSPP, 84, 6},
-	{ DBGBUS_DSPP, 84, 7},
-
-	{ DBGBUS_DSPP, 85, 1},
-	{ DBGBUS_DSPP, 85, 2},
-	{ DBGBUS_DSPP, 85, 3},
-	{ DBGBUS_DSPP, 85, 4},
-	{ DBGBUS_DSPP, 85, 5},
-	{ DBGBUS_DSPP, 85, 6},
-	{ DBGBUS_DSPP, 85, 7},
-
-	{ DBGBUS_DSPP, 86, 1},
-	{ DBGBUS_DSPP, 86, 2},
-	{ DBGBUS_DSPP, 86, 3},
-	{ DBGBUS_DSPP, 86, 4},
-	{ DBGBUS_DSPP, 86, 5},
-	{ DBGBUS_DSPP, 86, 6},
-	{ DBGBUS_DSPP, 86, 7},
-
-	{ DBGBUS_DSPP, 87, 1},
-	{ DBGBUS_DSPP, 87, 2},
-	{ DBGBUS_DSPP, 87, 3},
-	{ DBGBUS_DSPP, 87, 4},
-	{ DBGBUS_DSPP, 87, 5},
-	{ DBGBUS_DSPP, 87, 6},
-	{ DBGBUS_DSPP, 87, 7},
-
-	/* LM1 */
-	{ DBGBUS_DSPP, 70, 1},
-	{ DBGBUS_DSPP, 70, 2},
-	{ DBGBUS_DSPP, 70, 3},
-	{ DBGBUS_DSPP, 70, 4},
-	{ DBGBUS_DSPP, 70, 5},
-	{ DBGBUS_DSPP, 70, 6},
-	{ DBGBUS_DSPP, 70, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 71, 1},
-	{ DBGBUS_DSPP, 71, 2},
-	{ DBGBUS_DSPP, 71, 3},
-	{ DBGBUS_DSPP, 71, 4},
-	{ DBGBUS_DSPP, 71, 5},
-	{ DBGBUS_DSPP, 71, 6},
-	{ DBGBUS_DSPP, 71, 7},
-
-	{ DBGBUS_DSPP, 72, 1},
-	{ DBGBUS_DSPP, 72, 2},
-	{ DBGBUS_DSPP, 72, 3},
-	{ DBGBUS_DSPP, 72, 4},
-	{ DBGBUS_DSPP, 72, 5},
-	{ DBGBUS_DSPP, 72, 6},
-	{ DBGBUS_DSPP, 72, 7},
-
-	{ DBGBUS_DSPP, 73, 1},
-	{ DBGBUS_DSPP, 73, 2},
-	{ DBGBUS_DSPP, 73, 3},
-	{ DBGBUS_DSPP, 73, 4},
-	{ DBGBUS_DSPP, 73, 5},
-	{ DBGBUS_DSPP, 73, 6},
-	{ DBGBUS_DSPP, 73, 7},
-
-	{ DBGBUS_DSPP, 74, 1},
-	{ DBGBUS_DSPP, 74, 2},
-	{ DBGBUS_DSPP, 74, 3},
-	{ DBGBUS_DSPP, 74, 4},
-	{ DBGBUS_DSPP, 74, 5},
-	{ DBGBUS_DSPP, 74, 6},
-	{ DBGBUS_DSPP, 74, 7},
-
-	{ DBGBUS_DSPP, 75, 1},
-	{ DBGBUS_DSPP, 75, 2},
-	{ DBGBUS_DSPP, 75, 3},
-	{ DBGBUS_DSPP, 75, 4},
-	{ DBGBUS_DSPP, 75, 5},
-	{ DBGBUS_DSPP, 75, 6},
-	{ DBGBUS_DSPP, 75, 7},
-
-	{ DBGBUS_DSPP, 76, 1},
-	{ DBGBUS_DSPP, 76, 2},
-	{ DBGBUS_DSPP, 76, 3},
-	{ DBGBUS_DSPP, 76, 4},
-	{ DBGBUS_DSPP, 76, 5},
-	{ DBGBUS_DSPP, 76, 6},
-	{ DBGBUS_DSPP, 76, 7},
-
-	{ DBGBUS_DSPP, 88, 1},
-	{ DBGBUS_DSPP, 88, 2},
-	{ DBGBUS_DSPP, 88, 3},
-	{ DBGBUS_DSPP, 88, 4},
-	{ DBGBUS_DSPP, 88, 5},
-	{ DBGBUS_DSPP, 88, 6},
-	{ DBGBUS_DSPP, 88, 7},
-
-	{ DBGBUS_DSPP, 89, 1},
-	{ DBGBUS_DSPP, 89, 2},
-	{ DBGBUS_DSPP, 89, 3},
-	{ DBGBUS_DSPP, 89, 4},
-	{ DBGBUS_DSPP, 89, 5},
-	{ DBGBUS_DSPP, 89, 6},
-	{ DBGBUS_DSPP, 89, 7},
-
-	{ DBGBUS_DSPP, 90, 1},
-	{ DBGBUS_DSPP, 90, 2},
-	{ DBGBUS_DSPP, 90, 3},
-	{ DBGBUS_DSPP, 90, 4},
-	{ DBGBUS_DSPP, 90, 5},
-	{ DBGBUS_DSPP, 90, 6},
-	{ DBGBUS_DSPP, 90, 7},
-
-	{ DBGBUS_DSPP, 91, 1},
-	{ DBGBUS_DSPP, 91, 2},
-	{ DBGBUS_DSPP, 91, 3},
-	{ DBGBUS_DSPP, 91, 4},
-	{ DBGBUS_DSPP, 91, 5},
-	{ DBGBUS_DSPP, 91, 6},
-	{ DBGBUS_DSPP, 91, 7},
-
-	/* LM2 */
-	{ DBGBUS_DSPP, 77, 0},
-	{ DBGBUS_DSPP, 77, 1},
-	{ DBGBUS_DSPP, 77, 2},
-	{ DBGBUS_DSPP, 77, 3},
-	{ DBGBUS_DSPP, 77, 4},
-	{ DBGBUS_DSPP, 77, 5},
-	{ DBGBUS_DSPP, 77, 6},
-	{ DBGBUS_DSPP, 77, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 78, 0},
-	{ DBGBUS_DSPP, 78, 1},
-	{ DBGBUS_DSPP, 78, 2},
-	{ DBGBUS_DSPP, 78, 3},
-	{ DBGBUS_DSPP, 78, 4},
-	{ DBGBUS_DSPP, 78, 5},
-	{ DBGBUS_DSPP, 78, 6},
-	{ DBGBUS_DSPP, 78, 7},
-
-	{ DBGBUS_DSPP, 79, 0},
-	{ DBGBUS_DSPP, 79, 1},
-	{ DBGBUS_DSPP, 79, 2},
-	{ DBGBUS_DSPP, 79, 3},
-	{ DBGBUS_DSPP, 79, 4},
-	{ DBGBUS_DSPP, 79, 5},
-	{ DBGBUS_DSPP, 79, 6},
-	{ DBGBUS_DSPP, 79, 7},
-
-	{ DBGBUS_DSPP, 80, 0},
-	{ DBGBUS_DSPP, 80, 1},
-	{ DBGBUS_DSPP, 80, 2},
-	{ DBGBUS_DSPP, 80, 3},
-	{ DBGBUS_DSPP, 80, 4},
-	{ DBGBUS_DSPP, 80, 5},
-	{ DBGBUS_DSPP, 80, 6},
-	{ DBGBUS_DSPP, 80, 7},
-
-	{ DBGBUS_DSPP, 81, 0},
-	{ DBGBUS_DSPP, 81, 1},
-	{ DBGBUS_DSPP, 81, 2},
-	{ DBGBUS_DSPP, 81, 3},
-	{ DBGBUS_DSPP, 81, 4},
-	{ DBGBUS_DSPP, 81, 5},
-	{ DBGBUS_DSPP, 81, 6},
-	{ DBGBUS_DSPP, 81, 7},
-
-	{ DBGBUS_DSPP, 82, 0},
-	{ DBGBUS_DSPP, 82, 1},
-	{ DBGBUS_DSPP, 82, 2},
-	{ DBGBUS_DSPP, 82, 3},
-	{ DBGBUS_DSPP, 82, 4},
-	{ DBGBUS_DSPP, 82, 5},
-	{ DBGBUS_DSPP, 82, 6},
-	{ DBGBUS_DSPP, 82, 7},
-
-	{ DBGBUS_DSPP, 83, 0},
-	{ DBGBUS_DSPP, 83, 1},
-	{ DBGBUS_DSPP, 83, 2},
-	{ DBGBUS_DSPP, 83, 3},
-	{ DBGBUS_DSPP, 83, 4},
-	{ DBGBUS_DSPP, 83, 5},
-	{ DBGBUS_DSPP, 83, 6},
-	{ DBGBUS_DSPP, 83, 7},
-
-	{ DBGBUS_DSPP, 92, 1},
-	{ DBGBUS_DSPP, 92, 2},
-	{ DBGBUS_DSPP, 92, 3},
-	{ DBGBUS_DSPP, 92, 4},
-	{ DBGBUS_DSPP, 92, 5},
-	{ DBGBUS_DSPP, 92, 6},
-	{ DBGBUS_DSPP, 92, 7},
-
-	{ DBGBUS_DSPP, 93, 1},
-	{ DBGBUS_DSPP, 93, 2},
-	{ DBGBUS_DSPP, 93, 3},
-	{ DBGBUS_DSPP, 93, 4},
-	{ DBGBUS_DSPP, 93, 5},
-	{ DBGBUS_DSPP, 93, 6},
-	{ DBGBUS_DSPP, 93, 7},
-
-	{ DBGBUS_DSPP, 94, 1},
-	{ DBGBUS_DSPP, 94, 2},
-	{ DBGBUS_DSPP, 94, 3},
-	{ DBGBUS_DSPP, 94, 4},
-	{ DBGBUS_DSPP, 94, 5},
-	{ DBGBUS_DSPP, 94, 6},
-	{ DBGBUS_DSPP, 94, 7},
-
-	{ DBGBUS_DSPP, 95, 1},
-	{ DBGBUS_DSPP, 95, 2},
-	{ DBGBUS_DSPP, 95, 3},
-	{ DBGBUS_DSPP, 95, 4},
-	{ DBGBUS_DSPP, 95, 5},
-	{ DBGBUS_DSPP, 95, 6},
-	{ DBGBUS_DSPP, 95, 7},
-
-	/* LM3 */
-	{ DBGBUS_DSPP, 110, 1},
-	{ DBGBUS_DSPP, 110, 2},
-	{ DBGBUS_DSPP, 110, 3},
-	{ DBGBUS_DSPP, 110, 4},
-	{ DBGBUS_DSPP, 110, 5},
-	{ DBGBUS_DSPP, 110, 6},
-	{ DBGBUS_DSPP, 110, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 111, 1},
-	{ DBGBUS_DSPP, 111, 2},
-	{ DBGBUS_DSPP, 111, 3},
-	{ DBGBUS_DSPP, 111, 4},
-	{ DBGBUS_DSPP, 111, 5},
-	{ DBGBUS_DSPP, 111, 6},
-	{ DBGBUS_DSPP, 111, 7},
-
-	{ DBGBUS_DSPP, 112, 1},
-	{ DBGBUS_DSPP, 112, 2},
-	{ DBGBUS_DSPP, 112, 3},
-	{ DBGBUS_DSPP, 112, 4},
-	{ DBGBUS_DSPP, 112, 5},
-	{ DBGBUS_DSPP, 112, 6},
-	{ DBGBUS_DSPP, 112, 7},
-
-	{ DBGBUS_DSPP, 113, 1},
-	{ DBGBUS_DSPP, 113, 2},
-	{ DBGBUS_DSPP, 113, 3},
-	{ DBGBUS_DSPP, 113, 4},
-	{ DBGBUS_DSPP, 113, 5},
-	{ DBGBUS_DSPP, 113, 6},
-	{ DBGBUS_DSPP, 113, 7},
-
-	{ DBGBUS_DSPP, 114, 1},
-	{ DBGBUS_DSPP, 114, 2},
-	{ DBGBUS_DSPP, 114, 3},
-	{ DBGBUS_DSPP, 114, 4},
-	{ DBGBUS_DSPP, 114, 5},
-	{ DBGBUS_DSPP, 114, 6},
-	{ DBGBUS_DSPP, 114, 7},
-
-	{ DBGBUS_DSPP, 115, 1},
-	{ DBGBUS_DSPP, 115, 2},
-	{ DBGBUS_DSPP, 115, 3},
-	{ DBGBUS_DSPP, 115, 4},
-	{ DBGBUS_DSPP, 115, 5},
-	{ DBGBUS_DSPP, 115, 6},
-	{ DBGBUS_DSPP, 115, 7},
-
-	{ DBGBUS_DSPP, 116, 1},
-	{ DBGBUS_DSPP, 116, 2},
-	{ DBGBUS_DSPP, 116, 3},
-	{ DBGBUS_DSPP, 116, 4},
-	{ DBGBUS_DSPP, 116, 5},
-	{ DBGBUS_DSPP, 116, 6},
-	{ DBGBUS_DSPP, 116, 7},
-
-	{ DBGBUS_DSPP, 117, 1},
-	{ DBGBUS_DSPP, 117, 2},
-	{ DBGBUS_DSPP, 117, 3},
-	{ DBGBUS_DSPP, 117, 4},
-	{ DBGBUS_DSPP, 117, 5},
-	{ DBGBUS_DSPP, 117, 6},
-	{ DBGBUS_DSPP, 117, 7},
-
-	{ DBGBUS_DSPP, 118, 1},
-	{ DBGBUS_DSPP, 118, 2},
-	{ DBGBUS_DSPP, 118, 3},
-	{ DBGBUS_DSPP, 118, 4},
-	{ DBGBUS_DSPP, 118, 5},
-	{ DBGBUS_DSPP, 118, 6},
-	{ DBGBUS_DSPP, 118, 7},
-
-	{ DBGBUS_DSPP, 119, 1},
-	{ DBGBUS_DSPP, 119, 2},
-	{ DBGBUS_DSPP, 119, 3},
-	{ DBGBUS_DSPP, 119, 4},
-	{ DBGBUS_DSPP, 119, 5},
-	{ DBGBUS_DSPP, 119, 6},
-	{ DBGBUS_DSPP, 119, 7},
-
-	{ DBGBUS_DSPP, 120, 1},
-	{ DBGBUS_DSPP, 120, 2},
-	{ DBGBUS_DSPP, 120, 3},
-	{ DBGBUS_DSPP, 120, 4},
-	{ DBGBUS_DSPP, 120, 5},
-	{ DBGBUS_DSPP, 120, 6},
-	{ DBGBUS_DSPP, 120, 7},
-
-	/* LM4 */
-	{ DBGBUS_DSPP, 96, 1},
-	{ DBGBUS_DSPP, 96, 2},
-	{ DBGBUS_DSPP, 96, 3},
-	{ DBGBUS_DSPP, 96, 4},
-	{ DBGBUS_DSPP, 96, 5},
-	{ DBGBUS_DSPP, 96, 6},
-	{ DBGBUS_DSPP, 96, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 97, 1},
-	{ DBGBUS_DSPP, 97, 2},
-	{ DBGBUS_DSPP, 97, 3},
-	{ DBGBUS_DSPP, 97, 4},
-	{ DBGBUS_DSPP, 97, 5},
-	{ DBGBUS_DSPP, 97, 6},
-	{ DBGBUS_DSPP, 97, 7},
-
-	{ DBGBUS_DSPP, 98, 1},
-	{ DBGBUS_DSPP, 98, 2},
-	{ DBGBUS_DSPP, 98, 3},
-	{ DBGBUS_DSPP, 98, 4},
-	{ DBGBUS_DSPP, 98, 5},
-	{ DBGBUS_DSPP, 98, 6},
-	{ DBGBUS_DSPP, 98, 7},
-
-	{ DBGBUS_DSPP, 99, 1},
-	{ DBGBUS_DSPP, 99, 2},
-	{ DBGBUS_DSPP, 99, 3},
-	{ DBGBUS_DSPP, 99, 4},
-	{ DBGBUS_DSPP, 99, 5},
-	{ DBGBUS_DSPP, 99, 6},
-	{ DBGBUS_DSPP, 99, 7},
-
-	{ DBGBUS_DSPP, 100, 1},
-	{ DBGBUS_DSPP, 100, 2},
-	{ DBGBUS_DSPP, 100, 3},
-	{ DBGBUS_DSPP, 100, 4},
-	{ DBGBUS_DSPP, 100, 5},
-	{ DBGBUS_DSPP, 100, 6},
-	{ DBGBUS_DSPP, 100, 7},
-
-	{ DBGBUS_DSPP, 101, 1},
-	{ DBGBUS_DSPP, 101, 2},
-	{ DBGBUS_DSPP, 101, 3},
-	{ DBGBUS_DSPP, 101, 4},
-	{ DBGBUS_DSPP, 101, 5},
-	{ DBGBUS_DSPP, 101, 6},
-	{ DBGBUS_DSPP, 101, 7},
-
-	{ DBGBUS_DSPP, 103, 1},
-	{ DBGBUS_DSPP, 103, 2},
-	{ DBGBUS_DSPP, 103, 3},
-	{ DBGBUS_DSPP, 103, 4},
-	{ DBGBUS_DSPP, 103, 5},
-	{ DBGBUS_DSPP, 103, 6},
-	{ DBGBUS_DSPP, 103, 7},
-
-	{ DBGBUS_DSPP, 105, 1},
-	{ DBGBUS_DSPP, 105, 2},
-	{ DBGBUS_DSPP, 105, 3},
-	{ DBGBUS_DSPP, 105, 4},
-	{ DBGBUS_DSPP, 105, 5},
-	{ DBGBUS_DSPP, 105, 6},
-	{ DBGBUS_DSPP, 105, 7},
-
-	{ DBGBUS_DSPP, 106, 1},
-	{ DBGBUS_DSPP, 106, 2},
-	{ DBGBUS_DSPP, 106, 3},
-	{ DBGBUS_DSPP, 106, 4},
-	{ DBGBUS_DSPP, 106, 5},
-	{ DBGBUS_DSPP, 106, 6},
-	{ DBGBUS_DSPP, 106, 7},
-
-	{ DBGBUS_DSPP, 109, 1},
-	{ DBGBUS_DSPP, 109, 2},
-	{ DBGBUS_DSPP, 109, 3},
-	{ DBGBUS_DSPP, 109, 4},
-	{ DBGBUS_DSPP, 109, 5},
-	{ DBGBUS_DSPP, 109, 6},
-	{ DBGBUS_DSPP, 109, 7},
-
-	{ DBGBUS_DSPP, 122, 1},
-	{ DBGBUS_DSPP, 122, 2},
-	{ DBGBUS_DSPP, 122, 3},
-	{ DBGBUS_DSPP, 122, 4},
-	{ DBGBUS_DSPP, 122, 5},
-	{ DBGBUS_DSPP, 122, 6},
-	{ DBGBUS_DSPP, 122, 7},
-
-	/* LM5 */
-	{ DBGBUS_DSPP, 124, 1},
-	{ DBGBUS_DSPP, 124, 2},
-	{ DBGBUS_DSPP, 124, 3},
-	{ DBGBUS_DSPP, 124, 4},
-	{ DBGBUS_DSPP, 124, 5},
-	{ DBGBUS_DSPP, 124, 6},
-	{ DBGBUS_DSPP, 124, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 125, 1},
-	{ DBGBUS_DSPP, 125, 2},
-	{ DBGBUS_DSPP, 125, 3},
-	{ DBGBUS_DSPP, 125, 4},
-	{ DBGBUS_DSPP, 125, 5},
-	{ DBGBUS_DSPP, 125, 6},
-	{ DBGBUS_DSPP, 125, 7},
-
-	{ DBGBUS_DSPP, 126, 1},
-	{ DBGBUS_DSPP, 126, 2},
-	{ DBGBUS_DSPP, 126, 3},
-	{ DBGBUS_DSPP, 126, 4},
-	{ DBGBUS_DSPP, 126, 5},
-	{ DBGBUS_DSPP, 126, 6},
-	{ DBGBUS_DSPP, 126, 7},
-
-	{ DBGBUS_DSPP, 127, 1},
-	{ DBGBUS_DSPP, 127, 2},
-	{ DBGBUS_DSPP, 127, 3},
-	{ DBGBUS_DSPP, 127, 4},
-	{ DBGBUS_DSPP, 127, 5},
-	{ DBGBUS_DSPP, 127, 6},
-	{ DBGBUS_DSPP, 127, 7},
-
-	{ DBGBUS_DSPP, 128, 1},
-	{ DBGBUS_DSPP, 128, 2},
-	{ DBGBUS_DSPP, 128, 3},
-	{ DBGBUS_DSPP, 128, 4},
-	{ DBGBUS_DSPP, 128, 5},
-	{ DBGBUS_DSPP, 128, 6},
-	{ DBGBUS_DSPP, 128, 7},
-
-	{ DBGBUS_DSPP, 129, 1},
-	{ DBGBUS_DSPP, 129, 2},
-	{ DBGBUS_DSPP, 129, 3},
-	{ DBGBUS_DSPP, 129, 4},
-	{ DBGBUS_DSPP, 129, 5},
-	{ DBGBUS_DSPP, 129, 6},
-	{ DBGBUS_DSPP, 129, 7},
-
-	{ DBGBUS_DSPP, 131, 1},
-	{ DBGBUS_DSPP, 131, 2},
-	{ DBGBUS_DSPP, 131, 3},
-	{ DBGBUS_DSPP, 131, 4},
-	{ DBGBUS_DSPP, 131, 5},
-	{ DBGBUS_DSPP, 131, 6},
-	{ DBGBUS_DSPP, 131, 7},
-
-	{ DBGBUS_DSPP, 132, 1},
-	{ DBGBUS_DSPP, 132, 2},
-	{ DBGBUS_DSPP, 132, 3},
-	{ DBGBUS_DSPP, 132, 4},
-	{ DBGBUS_DSPP, 132, 5},
-	{ DBGBUS_DSPP, 132, 6},
-	{ DBGBUS_DSPP, 132, 7},
-
-	{ DBGBUS_DSPP, 133, 1},
-	{ DBGBUS_DSPP, 133, 2},
-	{ DBGBUS_DSPP, 133, 3},
-	{ DBGBUS_DSPP, 133, 4},
-	{ DBGBUS_DSPP, 133, 5},
-	{ DBGBUS_DSPP, 133, 6},
-	{ DBGBUS_DSPP, 133, 7},
-
-	{ DBGBUS_DSPP, 134, 1},
-	{ DBGBUS_DSPP, 134, 2},
-	{ DBGBUS_DSPP, 134, 3},
-	{ DBGBUS_DSPP, 134, 4},
-	{ DBGBUS_DSPP, 134, 5},
-	{ DBGBUS_DSPP, 134, 6},
-	{ DBGBUS_DSPP, 134, 7},
-
-	{ DBGBUS_DSPP, 135, 1},
-	{ DBGBUS_DSPP, 135, 2},
-	{ DBGBUS_DSPP, 135, 3},
-	{ DBGBUS_DSPP, 135, 4},
-	{ DBGBUS_DSPP, 135, 5},
-	{ DBGBUS_DSPP, 135, 6},
-	{ DBGBUS_DSPP, 135, 7},
-
-	/* csc */
-	{ DBGBUS_SSPP0, 7, 0},
-	{ DBGBUS_SSPP0, 7, 1},
-	{ DBGBUS_SSPP0, 7, 2},
-	{ DBGBUS_SSPP0, 27, 0},
-	{ DBGBUS_SSPP0, 27, 1},
-	{ DBGBUS_SSPP0, 27, 2},
-	{ DBGBUS_SSPP1, 7, 0},
-	{ DBGBUS_SSPP1, 7, 1},
-	{ DBGBUS_SSPP1, 7, 2},
-	{ DBGBUS_SSPP1, 27, 0},
-	{ DBGBUS_SSPP1, 27, 1},
-	{ DBGBUS_SSPP1, 27, 2},
-
-	/* pcc */
-	{ DBGBUS_SSPP0, 43, 3},
-	{ DBGBUS_SSPP0, 47, 3},
-	{ DBGBUS_SSPP1, 43, 3},
-	{ DBGBUS_SSPP1, 47, 3},
-
-	/* spa */
-	{ DBGBUS_SSPP0, 8,  0},
-	{ DBGBUS_SSPP0, 28, 0},
-	{ DBGBUS_SSPP1, 8,  0},
-	{ DBGBUS_SSPP1, 28, 0},
-
-	/* dspp pa */
-	{ DBGBUS_DSPP, 13, 0},
-	{ DBGBUS_DSPP, 19, 0},
-	{ DBGBUS_DSPP, 24, 0},
-	{ DBGBUS_DSPP, 37, 0},
-
-	/* igc */
-	{ DBGBUS_SSPP0, 39, 0},
-	{ DBGBUS_SSPP0, 39, 1},
-	{ DBGBUS_SSPP0, 39, 2},
-
-	{ DBGBUS_SSPP1, 39, 0},
-	{ DBGBUS_SSPP1, 39, 1},
-	{ DBGBUS_SSPP1, 39, 2},
-
-	{ DBGBUS_SSPP0, 46, 0},
-	{ DBGBUS_SSPP0, 46, 1},
-	{ DBGBUS_SSPP0, 46, 2},
-
-	{ DBGBUS_SSPP1, 46, 0},
-	{ DBGBUS_SSPP1, 46, 1},
-	{ DBGBUS_SSPP1, 46, 2},
-
-	{ DBGBUS_DSPP, 14, 0},
-	{ DBGBUS_DSPP, 14, 1},
-	{ DBGBUS_DSPP, 14, 2},
-	{ DBGBUS_DSPP, 20, 0},
-	{ DBGBUS_DSPP, 20, 1},
-	{ DBGBUS_DSPP, 20, 2},
-	{ DBGBUS_DSPP, 25, 0},
-	{ DBGBUS_DSPP, 25, 1},
-	{ DBGBUS_DSPP, 25, 2},
-	{ DBGBUS_DSPP, 38, 0},
-	{ DBGBUS_DSPP, 38, 1},
-	{ DBGBUS_DSPP, 38, 2},
-
-	/* intf0-3 */
-	{ DBGBUS_PERIPH, 0, 0},
-	{ DBGBUS_PERIPH, 1, 0},
-	{ DBGBUS_PERIPH, 2, 0},
-	{ DBGBUS_PERIPH, 3, 0},
-	{ DBGBUS_PERIPH, 4, 0},
-	{ DBGBUS_PERIPH, 5, 0},
-
-	/* te counter wrapper */
-	{ DBGBUS_PERIPH, 60, 0},
-	{ DBGBUS_PERIPH, 60, 1},
-	{ DBGBUS_PERIPH, 60, 2},
-	{ DBGBUS_PERIPH, 60, 3},
-	{ DBGBUS_PERIPH, 60, 4},
-	{ DBGBUS_PERIPH, 60, 5},
-
-	/* dsc0 */
-	{ DBGBUS_PERIPH, 47, 0},
-	{ DBGBUS_PERIPH, 47, 1},
-	{ DBGBUS_PERIPH, 47, 2},
-	{ DBGBUS_PERIPH, 47, 3},
-	{ DBGBUS_PERIPH, 47, 4},
-	{ DBGBUS_PERIPH, 47, 5},
-	{ DBGBUS_PERIPH, 47, 6},
-	{ DBGBUS_PERIPH, 47, 7},
-
-	/* dsc1 */
-	{ DBGBUS_PERIPH, 48, 0},
-	{ DBGBUS_PERIPH, 48, 1},
-	{ DBGBUS_PERIPH, 48, 2},
-	{ DBGBUS_PERIPH, 48, 3},
-	{ DBGBUS_PERIPH, 48, 4},
-	{ DBGBUS_PERIPH, 48, 5},
-	{ DBGBUS_PERIPH, 48, 6},
-	{ DBGBUS_PERIPH, 48, 7},
-
-	/* dsc2 */
-	{ DBGBUS_PERIPH, 50, 0},
-	{ DBGBUS_PERIPH, 50, 1},
-	{ DBGBUS_PERIPH, 50, 2},
-	{ DBGBUS_PERIPH, 50, 3},
-	{ DBGBUS_PERIPH, 50, 4},
-	{ DBGBUS_PERIPH, 50, 5},
-	{ DBGBUS_PERIPH, 50, 6},
-	{ DBGBUS_PERIPH, 50, 7},
-
-	/* dsc3 */
-	{ DBGBUS_PERIPH, 51, 0},
-	{ DBGBUS_PERIPH, 51, 1},
-	{ DBGBUS_PERIPH, 51, 2},
-	{ DBGBUS_PERIPH, 51, 3},
-	{ DBGBUS_PERIPH, 51, 4},
-	{ DBGBUS_PERIPH, 51, 5},
-	{ DBGBUS_PERIPH, 51, 6},
-	{ DBGBUS_PERIPH, 51, 7},
-
-	/* dsc4 */
-	{ DBGBUS_PERIPH, 52, 0},
-	{ DBGBUS_PERIPH, 52, 1},
-	{ DBGBUS_PERIPH, 52, 2},
-	{ DBGBUS_PERIPH, 52, 3},
-	{ DBGBUS_PERIPH, 52, 4},
-	{ DBGBUS_PERIPH, 52, 5},
-	{ DBGBUS_PERIPH, 52, 6},
-	{ DBGBUS_PERIPH, 52, 7},
-
-	/* dsc5 */
-	{ DBGBUS_PERIPH, 53, 0},
-	{ DBGBUS_PERIPH, 53, 1},
-	{ DBGBUS_PERIPH, 53, 2},
-	{ DBGBUS_PERIPH, 53, 3},
-	{ DBGBUS_PERIPH, 53, 4},
-	{ DBGBUS_PERIPH, 53, 5},
-	{ DBGBUS_PERIPH, 53, 6},
-	{ DBGBUS_PERIPH, 53, 7},
-
-	/* tear-check */
-	/* INTF_0 */
-	{ DBGBUS_PERIPH, 63, 0 },
-	{ DBGBUS_PERIPH, 63, 1 },
-	{ DBGBUS_PERIPH, 63, 2 },
-	{ DBGBUS_PERIPH, 63, 3 },
-	{ DBGBUS_PERIPH, 63, 4 },
-	{ DBGBUS_PERIPH, 63, 5 },
-	{ DBGBUS_PERIPH, 63, 6 },
-	{ DBGBUS_PERIPH, 63, 7 },
-
-	/* INTF_1 */
-	{ DBGBUS_PERIPH, 64, 0 },
-	{ DBGBUS_PERIPH, 64, 1 },
-	{ DBGBUS_PERIPH, 64, 2 },
-	{ DBGBUS_PERIPH, 64, 3 },
-	{ DBGBUS_PERIPH, 64, 4 },
-	{ DBGBUS_PERIPH, 64, 5 },
-	{ DBGBUS_PERIPH, 64, 6 },
-	{ DBGBUS_PERIPH, 64, 7 },
-
-	/* INTF_2 */
-	{ DBGBUS_PERIPH, 65, 0 },
-	{ DBGBUS_PERIPH, 65, 1 },
-	{ DBGBUS_PERIPH, 65, 2 },
-	{ DBGBUS_PERIPH, 65, 3 },
-	{ DBGBUS_PERIPH, 65, 4 },
-	{ DBGBUS_PERIPH, 65, 5 },
-	{ DBGBUS_PERIPH, 65, 6 },
-	{ DBGBUS_PERIPH, 65, 7 },
-
-	/* INTF_4 */
-	{ DBGBUS_PERIPH, 66, 0 },
-	{ DBGBUS_PERIPH, 66, 1 },
-	{ DBGBUS_PERIPH, 66, 2 },
-	{ DBGBUS_PERIPH, 66, 3 },
-	{ DBGBUS_PERIPH, 66, 4 },
-	{ DBGBUS_PERIPH, 66, 5 },
-	{ DBGBUS_PERIPH, 66, 6 },
-	{ DBGBUS_PERIPH, 66, 7 },
-
-	/* INTF_5 */
-	{ DBGBUS_PERIPH, 67, 0 },
-	{ DBGBUS_PERIPH, 67, 1 },
-	{ DBGBUS_PERIPH, 67, 2 },
-	{ DBGBUS_PERIPH, 67, 3 },
-	{ DBGBUS_PERIPH, 67, 4 },
-	{ DBGBUS_PERIPH, 67, 5 },
-	{ DBGBUS_PERIPH, 67, 6 },
-	{ DBGBUS_PERIPH, 67, 7 },
-
-	/* INTF_3 */
-	{ DBGBUS_PERIPH, 73, 0 },
-	{ DBGBUS_PERIPH, 73, 1 },
-	{ DBGBUS_PERIPH, 73, 2 },
-	{ DBGBUS_PERIPH, 73, 3 },
-	{ DBGBUS_PERIPH, 73, 4 },
-	{ DBGBUS_PERIPH, 73, 5 },
-	{ DBGBUS_PERIPH, 73, 6 },
-	{ DBGBUS_PERIPH, 73, 7 },
-
-	/* cdwn */
-	{ DBGBUS_PERIPH, 80, 0},
-	{ DBGBUS_PERIPH, 80, 1},
-	{ DBGBUS_PERIPH, 80, 2},
-
-	{ DBGBUS_PERIPH, 81, 0},
-	{ DBGBUS_PERIPH, 81, 1},
-	{ DBGBUS_PERIPH, 81, 2},
-
-	{ DBGBUS_PERIPH, 82, 0},
-	{ DBGBUS_PERIPH, 82, 1},
-	{ DBGBUS_PERIPH, 82, 2},
-	{ DBGBUS_PERIPH, 82, 3},
-	{ DBGBUS_PERIPH, 82, 4},
-	{ DBGBUS_PERIPH, 82, 5},
-	{ DBGBUS_PERIPH, 82, 6},
-	{ DBGBUS_PERIPH, 82, 7},
-
-	/* DPTX1 */
-	{ DBGBUS_PERIPH, 68, 0},
-	{ DBGBUS_PERIPH, 68, 1},
-	{ DBGBUS_PERIPH, 68, 2},
-	{ DBGBUS_PERIPH, 68, 3},
-	{ DBGBUS_PERIPH, 68, 4},
-	{ DBGBUS_PERIPH, 68, 5},
-	{ DBGBUS_PERIPH, 68, 6},
-	{ DBGBUS_PERIPH, 68, 7},
-
-	/* DP */
-	{ DBGBUS_PERIPH, 69, 0},
-	{ DBGBUS_PERIPH, 69, 1},
-	{ DBGBUS_PERIPH, 69, 2},
-	{ DBGBUS_PERIPH, 69, 3},
-	{ DBGBUS_PERIPH, 69, 4},
-	{ DBGBUS_PERIPH, 69, 5},
-
-	/* dsi0 */
-	{ DBGBUS_PERIPH, 70, 0},
-	{ DBGBUS_PERIPH, 70, 1},
-	{ DBGBUS_PERIPH, 70, 2},
-	{ DBGBUS_PERIPH, 70, 3},
-	{ DBGBUS_PERIPH, 70, 4},
-	{ DBGBUS_PERIPH, 70, 5},
-
-	/* dsi1 */
-	{ DBGBUS_PERIPH, 71, 0},
-	{ DBGBUS_PERIPH, 71, 1},
-	{ DBGBUS_PERIPH, 71, 2},
-	{ DBGBUS_PERIPH, 71, 3},
-	{ DBGBUS_PERIPH, 71, 4},
-	{ DBGBUS_PERIPH, 71, 5},
-
-	/* eDP */
-	{ DBGBUS_PERIPH, 72, 0},
-	{ DBGBUS_PERIPH, 72, 1},
-	{ DBGBUS_PERIPH, 72, 2},
-	{ DBGBUS_PERIPH, 72, 3},
-	{ DBGBUS_PERIPH, 72, 4},
-	{ DBGBUS_PERIPH, 72, 5},
-
-};
-
-static struct sde_debug_bus_entry dbg_bus_sde_lahaina[] = {
-	/* Unpack 0 sspp 0*/
-	{ DBGBUS_SSPP0, 35, 2 },
-	{ DBGBUS_SSPP0, 50, 2 },
-	{ DBGBUS_SSPP0, 60, 2 },
-	{ DBGBUS_SSPP0, 70, 2 },
-
-	/* Unpack 1 sspp 0*/
-	{ DBGBUS_SSPP0, 36, 2 },
-	{ DBGBUS_SSPP0, 51, 2 },
-	{ DBGBUS_SSPP0, 61, 2 },
-	{ DBGBUS_SSPP0, 71, 2 },
-
-	/* Unpack 2 sspp 0*/
-	{ DBGBUS_SSPP0, 37, 2 },
-	{ DBGBUS_SSPP0, 52, 2 },
-	{ DBGBUS_SSPP0, 62, 2 },
-	{ DBGBUS_SSPP0, 72, 2 },
-
-	/* Unpack 3 sspp 0*/
-	{ DBGBUS_SSPP0, 38, 2 },
-	{ DBGBUS_SSPP0, 53, 2 },
-	{ DBGBUS_SSPP0, 63, 2 },
-	{ DBGBUS_SSPP0, 73, 2 },
-
-	/* Unpack 0 sspp 1*/
-	{ DBGBUS_SSPP1, 35, 2 },
-	{ DBGBUS_SSPP1, 50, 2 },
-	{ DBGBUS_SSPP1, 60, 2 },
-	{ DBGBUS_SSPP1, 70, 2 },
-
-	/* Unpack 1 sspp 1*/
-	{ DBGBUS_SSPP1, 36, 2 },
-	{ DBGBUS_SSPP1, 51, 2 },
-	{ DBGBUS_SSPP1, 61, 2 },
-	{ DBGBUS_SSPP1, 71, 2 },
-
-	/* Unpack 2 sspp 1*/
-	{ DBGBUS_SSPP1, 37, 2 },
-	{ DBGBUS_SSPP1, 52, 2 },
-	{ DBGBUS_SSPP1, 62, 2 },
-	{ DBGBUS_SSPP1, 72, 2 },
-
-	/* Unpack 3 sspp 1*/
-	{ DBGBUS_SSPP1, 38, 2 },
-	{ DBGBUS_SSPP1, 53, 2 },
-	{ DBGBUS_SSPP1, 63, 2 },
-	{ DBGBUS_SSPP1, 73, 2 },
-
-	/* scheduler */
-	{ DBGBUS_DSPP, 130, 0 },
-	{ DBGBUS_DSPP, 130, 1 },
-	{ DBGBUS_DSPP, 130, 2 },
-	{ DBGBUS_DSPP, 130, 3 },
-	{ DBGBUS_DSPP, 130, 4 },
-	{ DBGBUS_DSPP, 130, 5 },
-
-	/* fetch sspp0 */
-	/* vig 0 */
-	{ DBGBUS_SSPP0, 0, 0 },
-	{ DBGBUS_SSPP0, 0, 1 },
-	{ DBGBUS_SSPP0, 0, 2 },
-	{ DBGBUS_SSPP0, 0, 3 },
-	{ DBGBUS_SSPP0, 0, 4 },
-	{ DBGBUS_SSPP0, 0, 5 },
-	{ DBGBUS_SSPP0, 0, 6 },
-	{ DBGBUS_SSPP0, 0, 7 },
-
-	{ DBGBUS_SSPP0, 1, 0 },
-	{ DBGBUS_SSPP0, 1, 1 },
-	{ DBGBUS_SSPP0, 1, 2 },
-	{ DBGBUS_SSPP0, 1, 3 },
-	{ DBGBUS_SSPP0, 1, 4 },
-	{ DBGBUS_SSPP0, 1, 5 },
-	{ DBGBUS_SSPP0, 1, 6 },
-	{ DBGBUS_SSPP0, 1, 7 },
-
-	{ DBGBUS_SSPP0, 2, 0 },
-	{ DBGBUS_SSPP0, 2, 1 },
-	{ DBGBUS_SSPP0, 2, 2 },
-	{ DBGBUS_SSPP0, 2, 3 },
-	{ DBGBUS_SSPP0, 2, 4 },
-	{ DBGBUS_SSPP0, 2, 5 },
-	{ DBGBUS_SSPP0, 2, 6 },
-	{ DBGBUS_SSPP0, 2, 7 },
-
-	{ DBGBUS_SSPP0, 4, 0 },
-	{ DBGBUS_SSPP0, 4, 1 },
-	{ DBGBUS_SSPP0, 4, 2 },
-	{ DBGBUS_SSPP0, 4, 3 },
-	{ DBGBUS_SSPP0, 4, 4 },
-	{ DBGBUS_SSPP0, 4, 5 },
-	{ DBGBUS_SSPP0, 4, 6 },
-	{ DBGBUS_SSPP0, 4, 7 },
-
-	{ DBGBUS_SSPP0, 5, 0 },
-	{ DBGBUS_SSPP0, 5, 1 },
-	{ DBGBUS_SSPP0, 5, 2 },
-	{ DBGBUS_SSPP0, 5, 3 },
-	{ DBGBUS_SSPP0, 5, 4 },
-	{ DBGBUS_SSPP0, 5, 5 },
-	{ DBGBUS_SSPP0, 5, 6 },
-	{ DBGBUS_SSPP0, 5, 7 },
-
-	/* vig 2 */
-	{ DBGBUS_SSPP0, 20, 0 },
-	{ DBGBUS_SSPP0, 20, 1 },
-	{ DBGBUS_SSPP0, 20, 2 },
-	{ DBGBUS_SSPP0, 20, 3 },
-	{ DBGBUS_SSPP0, 20, 4 },
-	{ DBGBUS_SSPP0, 20, 5 },
-	{ DBGBUS_SSPP0, 20, 6 },
-	{ DBGBUS_SSPP0, 20, 7 },
-
-	{ DBGBUS_SSPP0, 21, 0 },
-	{ DBGBUS_SSPP0, 21, 1 },
-	{ DBGBUS_SSPP0, 21, 2 },
-	{ DBGBUS_SSPP0, 21, 3 },
-	{ DBGBUS_SSPP0, 21, 4 },
-	{ DBGBUS_SSPP0, 21, 5 },
-	{ DBGBUS_SSPP0, 21, 6 },
-	{ DBGBUS_SSPP0, 21, 7 },
-
-	{ DBGBUS_SSPP0, 22, 0 },
-	{ DBGBUS_SSPP0, 22, 1 },
-	{ DBGBUS_SSPP0, 22, 2 },
-	{ DBGBUS_SSPP0, 22, 3 },
-	{ DBGBUS_SSPP0, 22, 4 },
-	{ DBGBUS_SSPP0, 22, 5 },
-	{ DBGBUS_SSPP0, 22, 6 },
-	{ DBGBUS_SSPP0, 22, 7 },
-
-	{ DBGBUS_SSPP0, 24, 0 },
-	{ DBGBUS_SSPP0, 24, 1 },
-	{ DBGBUS_SSPP0, 24, 2 },
-	{ DBGBUS_SSPP0, 24, 3 },
-	{ DBGBUS_SSPP0, 24, 4 },
-	{ DBGBUS_SSPP0, 24, 5 },
-	{ DBGBUS_SSPP0, 24, 6 },
-	{ DBGBUS_SSPP0, 24, 7 },
-
-	{ DBGBUS_SSPP0, 25, 0 },
-	{ DBGBUS_SSPP0, 25, 1 },
-	{ DBGBUS_SSPP0, 25, 2 },
-	{ DBGBUS_SSPP0, 25, 3 },
-	{ DBGBUS_SSPP0, 25, 4 },
-	{ DBGBUS_SSPP0, 25, 5 },
-	{ DBGBUS_SSPP0, 25, 6 },
-	{ DBGBUS_SSPP0, 25, 7 },
-
-	/* dma 2 */
-	{ DBGBUS_SSPP0, 30, 0 },
-	{ DBGBUS_SSPP0, 30, 1 },
-	{ DBGBUS_SSPP0, 30, 2 },
-	{ DBGBUS_SSPP0, 30, 3 },
-	{ DBGBUS_SSPP0, 30, 4 },
-	{ DBGBUS_SSPP0, 30, 5 },
-	{ DBGBUS_SSPP0, 30, 6 },
-	{ DBGBUS_SSPP0, 30, 7 },
-
-	{ DBGBUS_SSPP0, 31, 0 },
-	{ DBGBUS_SSPP0, 31, 1 },
-	{ DBGBUS_SSPP0, 31, 2 },
-	{ DBGBUS_SSPP0, 31, 3 },
-	{ DBGBUS_SSPP0, 31, 4 },
-	{ DBGBUS_SSPP0, 31, 5 },
-	{ DBGBUS_SSPP0, 31, 6 },
-	{ DBGBUS_SSPP0, 31, 7 },
-
-	{ DBGBUS_SSPP0, 32, 0 },
-	{ DBGBUS_SSPP0, 32, 1 },
-	{ DBGBUS_SSPP0, 32, 2 },
-	{ DBGBUS_SSPP0, 32, 3 },
-	{ DBGBUS_SSPP0, 32, 4 },
-	{ DBGBUS_SSPP0, 32, 5 },
-	{ DBGBUS_SSPP0, 32, 6 },
-	{ DBGBUS_SSPP0, 32, 7 },
-
-	{ DBGBUS_SSPP0, 33, 0 },
-	{ DBGBUS_SSPP0, 33, 1 },
-	{ DBGBUS_SSPP0, 33, 2 },
-	{ DBGBUS_SSPP0, 33, 3 },
-	{ DBGBUS_SSPP0, 33, 4 },
-	{ DBGBUS_SSPP0, 33, 5 },
-	{ DBGBUS_SSPP0, 33, 6 },
-	{ DBGBUS_SSPP0, 33, 7 },
-
-	{ DBGBUS_SSPP0, 34, 0 },
-	{ DBGBUS_SSPP0, 34, 1 },
-	{ DBGBUS_SSPP0, 34, 2 },
-	{ DBGBUS_SSPP0, 34, 3 },
-	{ DBGBUS_SSPP0, 34, 4 },
-	{ DBGBUS_SSPP0, 34, 5 },
-	{ DBGBUS_SSPP0, 34, 6 },
-	{ DBGBUS_SSPP0, 34, 7 },
-
-	/* dma 0 */
-	{ DBGBUS_SSPP0, 40, 0 },
-	{ DBGBUS_SSPP0, 40, 1 },
-	{ DBGBUS_SSPP0, 40, 2 },
-	{ DBGBUS_SSPP0, 40, 3 },
-	{ DBGBUS_SSPP0, 40, 4 },
-	{ DBGBUS_SSPP0, 40, 5 },
-	{ DBGBUS_SSPP0, 40, 6 },
-	{ DBGBUS_SSPP0, 40, 7 },
-
-	{ DBGBUS_SSPP0, 41, 0 },
-	{ DBGBUS_SSPP0, 41, 1 },
-	{ DBGBUS_SSPP0, 41, 2 },
-	{ DBGBUS_SSPP0, 41, 3 },
-	{ DBGBUS_SSPP0, 41, 4 },
-	{ DBGBUS_SSPP0, 41, 5 },
-	{ DBGBUS_SSPP0, 41, 6 },
-	{ DBGBUS_SSPP0, 41, 7 },
-
-	{ DBGBUS_SSPP0, 42, 0 },
-	{ DBGBUS_SSPP0, 42, 1 },
-	{ DBGBUS_SSPP0, 42, 2 },
-	{ DBGBUS_SSPP0, 42, 3 },
-	{ DBGBUS_SSPP0, 42, 4 },
-	{ DBGBUS_SSPP0, 42, 5 },
-	{ DBGBUS_SSPP0, 42, 6 },
-	{ DBGBUS_SSPP0, 42, 7 },
-
-	{ DBGBUS_SSPP0, 44, 0 },
-	{ DBGBUS_SSPP0, 44, 1 },
-	{ DBGBUS_SSPP0, 44, 2 },
-	{ DBGBUS_SSPP0, 44, 3 },
-	{ DBGBUS_SSPP0, 44, 4 },
-	{ DBGBUS_SSPP0, 44, 5 },
-	{ DBGBUS_SSPP0, 44, 6 },
-	{ DBGBUS_SSPP0, 44, 7 },
-
-	{ DBGBUS_SSPP0, 45, 0 },
-	{ DBGBUS_SSPP0, 45, 1 },
-	{ DBGBUS_SSPP0, 45, 2 },
-	{ DBGBUS_SSPP0, 45, 3 },
-	{ DBGBUS_SSPP0, 45, 4 },
-	{ DBGBUS_SSPP0, 45, 5 },
-	{ DBGBUS_SSPP0, 45, 6 },
-	{ DBGBUS_SSPP0, 45, 7 },
-
-	/* fetch sspp1 */
-	/* vig 1 */
-	{ DBGBUS_SSPP1, 0, 0 },
-	{ DBGBUS_SSPP1, 0, 1 },
-	{ DBGBUS_SSPP1, 0, 2 },
-	{ DBGBUS_SSPP1, 0, 3 },
-	{ DBGBUS_SSPP1, 0, 4 },
-	{ DBGBUS_SSPP1, 0, 5 },
-	{ DBGBUS_SSPP1, 0, 6 },
-	{ DBGBUS_SSPP1, 0, 7 },
-
-	{ DBGBUS_SSPP1, 1, 0 },
-	{ DBGBUS_SSPP1, 1, 1 },
-	{ DBGBUS_SSPP1, 1, 2 },
-	{ DBGBUS_SSPP1, 1, 3 },
-	{ DBGBUS_SSPP1, 1, 4 },
-	{ DBGBUS_SSPP1, 1, 5 },
-	{ DBGBUS_SSPP1, 1, 6 },
-	{ DBGBUS_SSPP1, 1, 7 },
-
-	{ DBGBUS_SSPP1, 2, 0 },
-	{ DBGBUS_SSPP1, 2, 1 },
-	{ DBGBUS_SSPP1, 2, 2 },
-	{ DBGBUS_SSPP1, 2, 3 },
-	{ DBGBUS_SSPP1, 2, 4 },
-	{ DBGBUS_SSPP1, 2, 5 },
-	{ DBGBUS_SSPP1, 2, 6 },
-	{ DBGBUS_SSPP1, 2, 7 },
-
-	{ DBGBUS_SSPP1, 4, 0 },
-	{ DBGBUS_SSPP1, 4, 1 },
-	{ DBGBUS_SSPP1, 4, 2 },
-	{ DBGBUS_SSPP1, 4, 3 },
-	{ DBGBUS_SSPP1, 4, 4 },
-	{ DBGBUS_SSPP1, 4, 5 },
-	{ DBGBUS_SSPP1, 4, 6 },
-	{ DBGBUS_SSPP1, 4, 7 },
-
-	{ DBGBUS_SSPP1, 5, 0 },
-	{ DBGBUS_SSPP1, 5, 1 },
-	{ DBGBUS_SSPP1, 5, 2 },
-	{ DBGBUS_SSPP1, 5, 3 },
-	{ DBGBUS_SSPP1, 5, 4 },
-	{ DBGBUS_SSPP1, 5, 5 },
-	{ DBGBUS_SSPP1, 5, 6 },
-	{ DBGBUS_SSPP1, 5, 7 },
-
-	/* vig 3 */
-	{ DBGBUS_SSPP1, 20, 0 },
-	{ DBGBUS_SSPP1, 20, 1 },
-	{ DBGBUS_SSPP1, 20, 2 },
-	{ DBGBUS_SSPP1, 20, 3 },
-	{ DBGBUS_SSPP1, 20, 4 },
-	{ DBGBUS_SSPP1, 20, 5 },
-	{ DBGBUS_SSPP1, 20, 6 },
-	{ DBGBUS_SSPP1, 20, 7 },
-
-	{ DBGBUS_SSPP1, 21, 0 },
-	{ DBGBUS_SSPP1, 21, 1 },
-	{ DBGBUS_SSPP1, 21, 2 },
-	{ DBGBUS_SSPP1, 21, 3 },
-	{ DBGBUS_SSPP1, 21, 4 },
-	{ DBGBUS_SSPP1, 21, 5 },
-	{ DBGBUS_SSPP1, 21, 6 },
-	{ DBGBUS_SSPP1, 21, 7 },
-
-	{ DBGBUS_SSPP1, 22, 0 },
-	{ DBGBUS_SSPP1, 22, 1 },
-	{ DBGBUS_SSPP1, 22, 2 },
-	{ DBGBUS_SSPP1, 22, 3 },
-	{ DBGBUS_SSPP1, 22, 4 },
-	{ DBGBUS_SSPP1, 22, 5 },
-	{ DBGBUS_SSPP1, 22, 6 },
-	{ DBGBUS_SSPP1, 22, 7 },
-
-	{ DBGBUS_SSPP1, 24, 0 },
-	{ DBGBUS_SSPP1, 24, 1 },
-	{ DBGBUS_SSPP1, 24, 2 },
-	{ DBGBUS_SSPP1, 24, 3 },
-	{ DBGBUS_SSPP1, 24, 4 },
-	{ DBGBUS_SSPP1, 24, 5 },
-	{ DBGBUS_SSPP1, 24, 6 },
-	{ DBGBUS_SSPP1, 24, 7 },
-
-	{ DBGBUS_SSPP1, 25, 0 },
-	{ DBGBUS_SSPP1, 25, 1 },
-	{ DBGBUS_SSPP1, 25, 2 },
-	{ DBGBUS_SSPP1, 25, 3 },
-	{ DBGBUS_SSPP1, 25, 4 },
-	{ DBGBUS_SSPP1, 25, 5 },
-	{ DBGBUS_SSPP1, 25, 6 },
-	{ DBGBUS_SSPP1, 25, 7 },
-
-	/* dma 3 */
-	{ DBGBUS_SSPP1, 30, 0 },
-	{ DBGBUS_SSPP1, 30, 1 },
-	{ DBGBUS_SSPP1, 30, 2 },
-	{ DBGBUS_SSPP1, 30, 3 },
-	{ DBGBUS_SSPP1, 30, 4 },
-	{ DBGBUS_SSPP1, 30, 5 },
-	{ DBGBUS_SSPP1, 30, 6 },
-	{ DBGBUS_SSPP1, 30, 7 },
-
-	{ DBGBUS_SSPP1, 31, 0 },
-	{ DBGBUS_SSPP1, 31, 1 },
-	{ DBGBUS_SSPP1, 31, 2 },
-	{ DBGBUS_SSPP1, 31, 3 },
-	{ DBGBUS_SSPP1, 31, 4 },
-	{ DBGBUS_SSPP1, 31, 5 },
-	{ DBGBUS_SSPP1, 31, 6 },
-	{ DBGBUS_SSPP1, 31, 7 },
-
-	{ DBGBUS_SSPP1, 32, 0 },
-	{ DBGBUS_SSPP1, 32, 1 },
-	{ DBGBUS_SSPP1, 32, 2 },
-	{ DBGBUS_SSPP1, 32, 3 },
-	{ DBGBUS_SSPP1, 32, 4 },
-	{ DBGBUS_SSPP1, 32, 5 },
-	{ DBGBUS_SSPP1, 32, 6 },
-	{ DBGBUS_SSPP1, 32, 7 },
-
-	{ DBGBUS_SSPP1, 33, 0 },
-	{ DBGBUS_SSPP1, 33, 1 },
-	{ DBGBUS_SSPP1, 33, 2 },
-	{ DBGBUS_SSPP1, 33, 3 },
-	{ DBGBUS_SSPP1, 33, 4 },
-	{ DBGBUS_SSPP1, 33, 5 },
-	{ DBGBUS_SSPP1, 33, 6 },
-	{ DBGBUS_SSPP1, 33, 7 },
-
-	{ DBGBUS_SSPP1, 34, 0 },
-	{ DBGBUS_SSPP1, 34, 1 },
-	{ DBGBUS_SSPP1, 34, 2 },
-	{ DBGBUS_SSPP1, 34, 3 },
-	{ DBGBUS_SSPP1, 34, 4 },
-	{ DBGBUS_SSPP1, 34, 5 },
-	{ DBGBUS_SSPP1, 34, 6 },
-	{ DBGBUS_SSPP1, 34, 7 },
-
-	/* dma 1 */
-	{ DBGBUS_SSPP1, 40, 0 },
-	{ DBGBUS_SSPP1, 40, 1 },
-	{ DBGBUS_SSPP1, 40, 2 },
-	{ DBGBUS_SSPP1, 40, 3 },
-	{ DBGBUS_SSPP1, 40, 4 },
-	{ DBGBUS_SSPP1, 40, 5 },
-	{ DBGBUS_SSPP1, 40, 6 },
-	{ DBGBUS_SSPP1, 40, 7 },
-
-	{ DBGBUS_SSPP1, 41, 0 },
-	{ DBGBUS_SSPP1, 41, 1 },
-	{ DBGBUS_SSPP1, 41, 2 },
-	{ DBGBUS_SSPP1, 41, 3 },
-	{ DBGBUS_SSPP1, 41, 4 },
-	{ DBGBUS_SSPP1, 41, 5 },
-	{ DBGBUS_SSPP1, 41, 6 },
-	{ DBGBUS_SSPP1, 41, 7 },
-
-	{ DBGBUS_SSPP1, 42, 0 },
-	{ DBGBUS_SSPP1, 42, 1 },
-	{ DBGBUS_SSPP1, 42, 2 },
-	{ DBGBUS_SSPP1, 42, 3 },
-	{ DBGBUS_SSPP1, 42, 4 },
-	{ DBGBUS_SSPP1, 42, 5 },
-	{ DBGBUS_SSPP1, 42, 6 },
-	{ DBGBUS_SSPP1, 42, 7 },
-
-	{ DBGBUS_SSPP1, 44, 0 },
-	{ DBGBUS_SSPP1, 44, 1 },
-	{ DBGBUS_SSPP1, 44, 2 },
-	{ DBGBUS_SSPP1, 44, 3 },
-	{ DBGBUS_SSPP1, 44, 4 },
-	{ DBGBUS_SSPP1, 44, 5 },
-	{ DBGBUS_SSPP1, 44, 6 },
-	{ DBGBUS_SSPP1, 44, 7 },
-
-	{ DBGBUS_SSPP1, 45, 0 },
-	{ DBGBUS_SSPP1, 45, 1 },
-	{ DBGBUS_SSPP1, 45, 2 },
-	{ DBGBUS_SSPP1, 45, 3 },
-	{ DBGBUS_SSPP1, 45, 4 },
-	{ DBGBUS_SSPP1, 45, 5 },
-	{ DBGBUS_SSPP1, 45, 6 },
-	{ DBGBUS_SSPP1, 45, 7 },
-
-	/* ppb_0 */
-	{ DBGBUS_DSPP, 31, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 33, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 35, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 42, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 47, 0, _sde_debug_bus_ppb0_dump },
-	{ DBGBUS_DSPP, 49, 0, _sde_debug_bus_ppb0_dump },
-
-	/* ppb_1 */
-	{ DBGBUS_DSPP, 32, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 34, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 36, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 43, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 48, 0, _sde_debug_bus_ppb1_dump },
-	{ DBGBUS_DSPP, 50, 0, _sde_debug_bus_ppb1_dump },
-
-	/* crossbar */
-	{ DBGBUS_DSPP, 0, 0, _sde_debug_bus_xbar_dump },
-
-	/* rotator */
-	{ DBGBUS_DSPP, 9, 0},
-
-	/* ltm */
-	{ DBGBUS_DSPP, 45, 0 },
-	{ DBGBUS_DSPP, 45, 1 },
-	{ DBGBUS_DSPP, 45, 2 },
-	{ DBGBUS_DSPP, 45, 3 },
-	{ DBGBUS_DSPP, 45, 4 },
-	{ DBGBUS_DSPP, 45, 5 },
-	{ DBGBUS_DSPP, 45, 6 },
-	{ DBGBUS_DSPP, 45, 7 },
-	{ DBGBUS_DSPP, 45, 8 },
-	{ DBGBUS_DSPP, 45, 9 },
-	{ DBGBUS_DSPP, 45, 10 },
-	{ DBGBUS_DSPP, 45, 11 },
-	{ DBGBUS_DSPP, 45, 12 },
-	{ DBGBUS_DSPP, 45, 13 },
-	{ DBGBUS_DSPP, 45, 14 },
-	{ DBGBUS_DSPP, 45, 15 },
-	{ DBGBUS_DSPP, 45, 16 },
-	{ DBGBUS_DSPP, 45, 17 },
-	{ DBGBUS_DSPP, 45, 18 },
-	{ DBGBUS_DSPP, 45, 31 },
-
-	{ DBGBUS_DSPP, 46, 0 },
-	{ DBGBUS_DSPP, 46, 1 },
-	{ DBGBUS_DSPP, 46, 2 },
-	{ DBGBUS_DSPP, 46, 3 },
-	{ DBGBUS_DSPP, 46, 4 },
-	{ DBGBUS_DSPP, 46, 5 },
-	{ DBGBUS_DSPP, 46, 6 },
-	{ DBGBUS_DSPP, 46, 7 },
-	{ DBGBUS_DSPP, 46, 8 },
-	{ DBGBUS_DSPP, 46, 9 },
-	{ DBGBUS_DSPP, 46, 10 },
-	{ DBGBUS_DSPP, 46, 11 },
-	{ DBGBUS_DSPP, 46, 12 },
-	{ DBGBUS_DSPP, 46, 13 },
-	{ DBGBUS_DSPP, 46, 14 },
-	{ DBGBUS_DSPP, 46, 15 },
-	{ DBGBUS_DSPP, 46, 16 },
-	{ DBGBUS_DSPP, 46, 17 },
-	{ DBGBUS_DSPP, 46, 18 },
-	{ DBGBUS_DSPP, 46, 31 },
-
-	/* blend */
-	/* LM0 */
-	{ DBGBUS_DSPP, 63, 1},
-	{ DBGBUS_DSPP, 63, 2},
-	{ DBGBUS_DSPP, 63, 3},
-	{ DBGBUS_DSPP, 63, 4},
-	{ DBGBUS_DSPP, 63, 5},
-	{ DBGBUS_DSPP, 63, 6},
-	{ DBGBUS_DSPP, 63, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 64, 1},
-	{ DBGBUS_DSPP, 64, 2},
-	{ DBGBUS_DSPP, 64, 3},
-	{ DBGBUS_DSPP, 64, 4},
-	{ DBGBUS_DSPP, 64, 5},
-	{ DBGBUS_DSPP, 64, 6},
-	{ DBGBUS_DSPP, 64, 7},
-
-	{ DBGBUS_DSPP, 65, 1},
-	{ DBGBUS_DSPP, 65, 2},
-	{ DBGBUS_DSPP, 65, 3},
-	{ DBGBUS_DSPP, 65, 4},
-	{ DBGBUS_DSPP, 65, 5},
-	{ DBGBUS_DSPP, 65, 6},
-	{ DBGBUS_DSPP, 65, 7},
-
-	{ DBGBUS_DSPP, 66, 1},
-	{ DBGBUS_DSPP, 66, 2},
-	{ DBGBUS_DSPP, 66, 3},
-	{ DBGBUS_DSPP, 66, 4},
-	{ DBGBUS_DSPP, 66, 5},
-	{ DBGBUS_DSPP, 66, 6},
-	{ DBGBUS_DSPP, 66, 7},
-
-	{ DBGBUS_DSPP, 67, 1},
-	{ DBGBUS_DSPP, 67, 2},
-	{ DBGBUS_DSPP, 67, 3},
-	{ DBGBUS_DSPP, 67, 4},
-	{ DBGBUS_DSPP, 67, 5},
-	{ DBGBUS_DSPP, 67, 6},
-	{ DBGBUS_DSPP, 67, 7},
-
-	{ DBGBUS_DSPP, 68, 1},
-	{ DBGBUS_DSPP, 68, 2},
-	{ DBGBUS_DSPP, 68, 3},
-	{ DBGBUS_DSPP, 68, 4},
-	{ DBGBUS_DSPP, 68, 5},
-	{ DBGBUS_DSPP, 68, 6},
-	{ DBGBUS_DSPP, 68, 7},
-
-	{ DBGBUS_DSPP, 69, 1},
-	{ DBGBUS_DSPP, 69, 2},
-	{ DBGBUS_DSPP, 69, 3},
-	{ DBGBUS_DSPP, 69, 4},
-	{ DBGBUS_DSPP, 69, 5},
-	{ DBGBUS_DSPP, 69, 6},
-	{ DBGBUS_DSPP, 69, 7},
-
-	{ DBGBUS_DSPP, 84, 1},
-	{ DBGBUS_DSPP, 84, 2},
-	{ DBGBUS_DSPP, 84, 3},
-	{ DBGBUS_DSPP, 84, 4},
-	{ DBGBUS_DSPP, 84, 5},
-	{ DBGBUS_DSPP, 84, 6},
-	{ DBGBUS_DSPP, 84, 7},
-
-	{ DBGBUS_DSPP, 85, 1},
-	{ DBGBUS_DSPP, 85, 2},
-	{ DBGBUS_DSPP, 85, 3},
-	{ DBGBUS_DSPP, 85, 4},
-	{ DBGBUS_DSPP, 85, 5},
-	{ DBGBUS_DSPP, 85, 6},
-	{ DBGBUS_DSPP, 85, 7},
-
-	{ DBGBUS_DSPP, 86, 1},
-	{ DBGBUS_DSPP, 86, 2},
-	{ DBGBUS_DSPP, 86, 3},
-	{ DBGBUS_DSPP, 86, 4},
-	{ DBGBUS_DSPP, 86, 5},
-	{ DBGBUS_DSPP, 86, 6},
-	{ DBGBUS_DSPP, 86, 7},
-
-	{ DBGBUS_DSPP, 87, 1},
-	{ DBGBUS_DSPP, 87, 2},
-	{ DBGBUS_DSPP, 87, 3},
-	{ DBGBUS_DSPP, 87, 4},
-	{ DBGBUS_DSPP, 87, 5},
-	{ DBGBUS_DSPP, 87, 6},
-	{ DBGBUS_DSPP, 87, 7},
-
-	/* LM1 */
-	{ DBGBUS_DSPP, 70, 1},
-	{ DBGBUS_DSPP, 70, 2},
-	{ DBGBUS_DSPP, 70, 3},
-	{ DBGBUS_DSPP, 70, 4},
-	{ DBGBUS_DSPP, 70, 5},
-	{ DBGBUS_DSPP, 70, 6},
-	{ DBGBUS_DSPP, 70, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 71, 1},
-	{ DBGBUS_DSPP, 71, 2},
-	{ DBGBUS_DSPP, 71, 3},
-	{ DBGBUS_DSPP, 71, 4},
-	{ DBGBUS_DSPP, 71, 5},
-	{ DBGBUS_DSPP, 71, 6},
-	{ DBGBUS_DSPP, 71, 7},
-
-	{ DBGBUS_DSPP, 72, 1},
-	{ DBGBUS_DSPP, 72, 2},
-	{ DBGBUS_DSPP, 72, 3},
-	{ DBGBUS_DSPP, 72, 4},
-	{ DBGBUS_DSPP, 72, 5},
-	{ DBGBUS_DSPP, 72, 6},
-	{ DBGBUS_DSPP, 72, 7},
-
-	{ DBGBUS_DSPP, 73, 1},
-	{ DBGBUS_DSPP, 73, 2},
-	{ DBGBUS_DSPP, 73, 3},
-	{ DBGBUS_DSPP, 73, 4},
-	{ DBGBUS_DSPP, 73, 5},
-	{ DBGBUS_DSPP, 73, 6},
-	{ DBGBUS_DSPP, 73, 7},
-
-	{ DBGBUS_DSPP, 74, 1},
-	{ DBGBUS_DSPP, 74, 2},
-	{ DBGBUS_DSPP, 74, 3},
-	{ DBGBUS_DSPP, 74, 4},
-	{ DBGBUS_DSPP, 74, 5},
-	{ DBGBUS_DSPP, 74, 6},
-	{ DBGBUS_DSPP, 74, 7},
-
-	{ DBGBUS_DSPP, 75, 1},
-	{ DBGBUS_DSPP, 75, 2},
-	{ DBGBUS_DSPP, 75, 3},
-	{ DBGBUS_DSPP, 75, 4},
-	{ DBGBUS_DSPP, 75, 5},
-	{ DBGBUS_DSPP, 75, 6},
-	{ DBGBUS_DSPP, 75, 7},
-
-	{ DBGBUS_DSPP, 76, 1},
-	{ DBGBUS_DSPP, 76, 2},
-	{ DBGBUS_DSPP, 76, 3},
-	{ DBGBUS_DSPP, 76, 4},
-	{ DBGBUS_DSPP, 76, 5},
-	{ DBGBUS_DSPP, 76, 6},
-	{ DBGBUS_DSPP, 76, 7},
-
-	{ DBGBUS_DSPP, 88, 1},
-	{ DBGBUS_DSPP, 88, 2},
-	{ DBGBUS_DSPP, 88, 3},
-	{ DBGBUS_DSPP, 88, 4},
-	{ DBGBUS_DSPP, 88, 5},
-	{ DBGBUS_DSPP, 88, 6},
-	{ DBGBUS_DSPP, 88, 7},
-
-	{ DBGBUS_DSPP, 89, 1},
-	{ DBGBUS_DSPP, 89, 2},
-	{ DBGBUS_DSPP, 89, 3},
-	{ DBGBUS_DSPP, 89, 4},
-	{ DBGBUS_DSPP, 89, 5},
-	{ DBGBUS_DSPP, 89, 6},
-	{ DBGBUS_DSPP, 89, 7},
-
-	{ DBGBUS_DSPP, 90, 1},
-	{ DBGBUS_DSPP, 90, 2},
-	{ DBGBUS_DSPP, 90, 3},
-	{ DBGBUS_DSPP, 90, 4},
-	{ DBGBUS_DSPP, 90, 5},
-	{ DBGBUS_DSPP, 90, 6},
-	{ DBGBUS_DSPP, 90, 7},
-
-	{ DBGBUS_DSPP, 91, 1},
-	{ DBGBUS_DSPP, 91, 2},
-	{ DBGBUS_DSPP, 91, 3},
-	{ DBGBUS_DSPP, 91, 4},
-	{ DBGBUS_DSPP, 91, 5},
-	{ DBGBUS_DSPP, 91, 6},
-	{ DBGBUS_DSPP, 91, 7},
-
-	/* LM2 */
-	{ DBGBUS_DSPP, 77, 0},
-	{ DBGBUS_DSPP, 77, 1},
-	{ DBGBUS_DSPP, 77, 2},
-	{ DBGBUS_DSPP, 77, 3},
-	{ DBGBUS_DSPP, 77, 4},
-	{ DBGBUS_DSPP, 77, 5},
-	{ DBGBUS_DSPP, 77, 6},
-	{ DBGBUS_DSPP, 77, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 78, 0},
-	{ DBGBUS_DSPP, 78, 1},
-	{ DBGBUS_DSPP, 78, 2},
-	{ DBGBUS_DSPP, 78, 3},
-	{ DBGBUS_DSPP, 78, 4},
-	{ DBGBUS_DSPP, 78, 5},
-	{ DBGBUS_DSPP, 78, 6},
-	{ DBGBUS_DSPP, 78, 7},
-
-	{ DBGBUS_DSPP, 79, 0},
-	{ DBGBUS_DSPP, 79, 1},
-	{ DBGBUS_DSPP, 79, 2},
-	{ DBGBUS_DSPP, 79, 3},
-	{ DBGBUS_DSPP, 79, 4},
-	{ DBGBUS_DSPP, 79, 5},
-	{ DBGBUS_DSPP, 79, 6},
-	{ DBGBUS_DSPP, 79, 7},
-
-	{ DBGBUS_DSPP, 80, 0},
-	{ DBGBUS_DSPP, 80, 1},
-	{ DBGBUS_DSPP, 80, 2},
-	{ DBGBUS_DSPP, 80, 3},
-	{ DBGBUS_DSPP, 80, 4},
-	{ DBGBUS_DSPP, 80, 5},
-	{ DBGBUS_DSPP, 80, 6},
-	{ DBGBUS_DSPP, 80, 7},
-
-	{ DBGBUS_DSPP, 81, 0},
-	{ DBGBUS_DSPP, 81, 1},
-	{ DBGBUS_DSPP, 81, 2},
-	{ DBGBUS_DSPP, 81, 3},
-	{ DBGBUS_DSPP, 81, 4},
-	{ DBGBUS_DSPP, 81, 5},
-	{ DBGBUS_DSPP, 81, 6},
-	{ DBGBUS_DSPP, 81, 7},
-
-	{ DBGBUS_DSPP, 82, 0},
-	{ DBGBUS_DSPP, 82, 1},
-	{ DBGBUS_DSPP, 82, 2},
-	{ DBGBUS_DSPP, 82, 3},
-	{ DBGBUS_DSPP, 82, 4},
-	{ DBGBUS_DSPP, 82, 5},
-	{ DBGBUS_DSPP, 82, 6},
-	{ DBGBUS_DSPP, 82, 7},
-
-	{ DBGBUS_DSPP, 83, 0},
-	{ DBGBUS_DSPP, 83, 1},
-	{ DBGBUS_DSPP, 83, 2},
-	{ DBGBUS_DSPP, 83, 3},
-	{ DBGBUS_DSPP, 83, 4},
-	{ DBGBUS_DSPP, 83, 5},
-	{ DBGBUS_DSPP, 83, 6},
-	{ DBGBUS_DSPP, 83, 7},
-
-	{ DBGBUS_DSPP, 92, 1},
-	{ DBGBUS_DSPP, 92, 2},
-	{ DBGBUS_DSPP, 92, 3},
-	{ DBGBUS_DSPP, 92, 4},
-	{ DBGBUS_DSPP, 92, 5},
-	{ DBGBUS_DSPP, 92, 6},
-	{ DBGBUS_DSPP, 92, 7},
-
-	{ DBGBUS_DSPP, 93, 1},
-	{ DBGBUS_DSPP, 93, 2},
-	{ DBGBUS_DSPP, 93, 3},
-	{ DBGBUS_DSPP, 93, 4},
-	{ DBGBUS_DSPP, 93, 5},
-	{ DBGBUS_DSPP, 93, 6},
-	{ DBGBUS_DSPP, 93, 7},
-
-	{ DBGBUS_DSPP, 94, 1},
-	{ DBGBUS_DSPP, 94, 2},
-	{ DBGBUS_DSPP, 94, 3},
-	{ DBGBUS_DSPP, 94, 4},
-	{ DBGBUS_DSPP, 94, 5},
-	{ DBGBUS_DSPP, 94, 6},
-	{ DBGBUS_DSPP, 94, 7},
-
-	{ DBGBUS_DSPP, 95, 1},
-	{ DBGBUS_DSPP, 95, 2},
-	{ DBGBUS_DSPP, 95, 3},
-	{ DBGBUS_DSPP, 95, 4},
-	{ DBGBUS_DSPP, 95, 5},
-	{ DBGBUS_DSPP, 95, 6},
-	{ DBGBUS_DSPP, 95, 7},
-
-	/* LM3 */
-	{ DBGBUS_DSPP, 110, 1},
-	{ DBGBUS_DSPP, 110, 2},
-	{ DBGBUS_DSPP, 110, 3},
-	{ DBGBUS_DSPP, 110, 4},
-	{ DBGBUS_DSPP, 110, 5},
-	{ DBGBUS_DSPP, 110, 6},
-	{ DBGBUS_DSPP, 110, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 111, 1},
-	{ DBGBUS_DSPP, 111, 2},
-	{ DBGBUS_DSPP, 111, 3},
-	{ DBGBUS_DSPP, 111, 4},
-	{ DBGBUS_DSPP, 111, 5},
-	{ DBGBUS_DSPP, 111, 6},
-	{ DBGBUS_DSPP, 111, 7},
-
-	{ DBGBUS_DSPP, 112, 1},
-	{ DBGBUS_DSPP, 112, 2},
-	{ DBGBUS_DSPP, 112, 3},
-	{ DBGBUS_DSPP, 112, 4},
-	{ DBGBUS_DSPP, 112, 5},
-	{ DBGBUS_DSPP, 112, 6},
-	{ DBGBUS_DSPP, 112, 7},
-
-	{ DBGBUS_DSPP, 113, 1},
-	{ DBGBUS_DSPP, 113, 2},
-	{ DBGBUS_DSPP, 113, 3},
-	{ DBGBUS_DSPP, 113, 4},
-	{ DBGBUS_DSPP, 113, 5},
-	{ DBGBUS_DSPP, 113, 6},
-	{ DBGBUS_DSPP, 113, 7},
-
-	{ DBGBUS_DSPP, 114, 1},
-	{ DBGBUS_DSPP, 114, 2},
-	{ DBGBUS_DSPP, 114, 3},
-	{ DBGBUS_DSPP, 114, 4},
-	{ DBGBUS_DSPP, 114, 5},
-	{ DBGBUS_DSPP, 114, 6},
-	{ DBGBUS_DSPP, 114, 7},
-
-	{ DBGBUS_DSPP, 115, 1},
-	{ DBGBUS_DSPP, 115, 2},
-	{ DBGBUS_DSPP, 115, 3},
-	{ DBGBUS_DSPP, 115, 4},
-	{ DBGBUS_DSPP, 115, 5},
-	{ DBGBUS_DSPP, 115, 6},
-	{ DBGBUS_DSPP, 115, 7},
-
-	{ DBGBUS_DSPP, 116, 1},
-	{ DBGBUS_DSPP, 116, 2},
-	{ DBGBUS_DSPP, 116, 3},
-	{ DBGBUS_DSPP, 116, 4},
-	{ DBGBUS_DSPP, 116, 5},
-	{ DBGBUS_DSPP, 116, 6},
-	{ DBGBUS_DSPP, 116, 7},
-
-	{ DBGBUS_DSPP, 117, 1},
-	{ DBGBUS_DSPP, 117, 2},
-	{ DBGBUS_DSPP, 117, 3},
-	{ DBGBUS_DSPP, 117, 4},
-	{ DBGBUS_DSPP, 117, 5},
-	{ DBGBUS_DSPP, 117, 6},
-	{ DBGBUS_DSPP, 117, 7},
-
-	{ DBGBUS_DSPP, 118, 1},
-	{ DBGBUS_DSPP, 118, 2},
-	{ DBGBUS_DSPP, 118, 3},
-	{ DBGBUS_DSPP, 118, 4},
-	{ DBGBUS_DSPP, 118, 5},
-	{ DBGBUS_DSPP, 118, 6},
-	{ DBGBUS_DSPP, 118, 7},
-
-	{ DBGBUS_DSPP, 119, 1},
-	{ DBGBUS_DSPP, 119, 2},
-	{ DBGBUS_DSPP, 119, 3},
-	{ DBGBUS_DSPP, 119, 4},
-	{ DBGBUS_DSPP, 119, 5},
-	{ DBGBUS_DSPP, 119, 6},
-	{ DBGBUS_DSPP, 119, 7},
-
-	{ DBGBUS_DSPP, 120, 1},
-	{ DBGBUS_DSPP, 120, 2},
-	{ DBGBUS_DSPP, 120, 3},
-	{ DBGBUS_DSPP, 120, 4},
-	{ DBGBUS_DSPP, 120, 5},
-	{ DBGBUS_DSPP, 120, 6},
-	{ DBGBUS_DSPP, 120, 7},
-
-	/* LM4 */
-	{ DBGBUS_DSPP, 96, 1},
-	{ DBGBUS_DSPP, 96, 2},
-	{ DBGBUS_DSPP, 96, 3},
-	{ DBGBUS_DSPP, 96, 4},
-	{ DBGBUS_DSPP, 96, 5},
-	{ DBGBUS_DSPP, 96, 6},
-	{ DBGBUS_DSPP, 96, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 97, 1},
-	{ DBGBUS_DSPP, 97, 2},
-	{ DBGBUS_DSPP, 97, 3},
-	{ DBGBUS_DSPP, 97, 4},
-	{ DBGBUS_DSPP, 97, 5},
-	{ DBGBUS_DSPP, 97, 6},
-	{ DBGBUS_DSPP, 97, 7},
-
-	{ DBGBUS_DSPP, 98, 1},
-	{ DBGBUS_DSPP, 98, 2},
-	{ DBGBUS_DSPP, 98, 3},
-	{ DBGBUS_DSPP, 98, 4},
-	{ DBGBUS_DSPP, 98, 5},
-	{ DBGBUS_DSPP, 98, 6},
-	{ DBGBUS_DSPP, 98, 7},
-
-	{ DBGBUS_DSPP, 99, 1},
-	{ DBGBUS_DSPP, 99, 2},
-	{ DBGBUS_DSPP, 99, 3},
-	{ DBGBUS_DSPP, 99, 4},
-	{ DBGBUS_DSPP, 99, 5},
-	{ DBGBUS_DSPP, 99, 6},
-	{ DBGBUS_DSPP, 99, 7},
-
-	{ DBGBUS_DSPP, 100, 1},
-	{ DBGBUS_DSPP, 100, 2},
-	{ DBGBUS_DSPP, 100, 3},
-	{ DBGBUS_DSPP, 100, 4},
-	{ DBGBUS_DSPP, 100, 5},
-	{ DBGBUS_DSPP, 100, 6},
-	{ DBGBUS_DSPP, 100, 7},
-
-	{ DBGBUS_DSPP, 101, 1},
-	{ DBGBUS_DSPP, 101, 2},
-	{ DBGBUS_DSPP, 101, 3},
-	{ DBGBUS_DSPP, 101, 4},
-	{ DBGBUS_DSPP, 101, 5},
-	{ DBGBUS_DSPP, 101, 6},
-	{ DBGBUS_DSPP, 101, 7},
-
-	{ DBGBUS_DSPP, 103, 1},
-	{ DBGBUS_DSPP, 103, 2},
-	{ DBGBUS_DSPP, 103, 3},
-	{ DBGBUS_DSPP, 103, 4},
-	{ DBGBUS_DSPP, 103, 5},
-	{ DBGBUS_DSPP, 103, 6},
-	{ DBGBUS_DSPP, 103, 7},
-
-	{ DBGBUS_DSPP, 105, 1},
-	{ DBGBUS_DSPP, 105, 2},
-	{ DBGBUS_DSPP, 105, 3},
-	{ DBGBUS_DSPP, 105, 4},
-	{ DBGBUS_DSPP, 105, 5},
-	{ DBGBUS_DSPP, 105, 6},
-	{ DBGBUS_DSPP, 105, 7},
-
-	{ DBGBUS_DSPP, 106, 1},
-	{ DBGBUS_DSPP, 106, 2},
-	{ DBGBUS_DSPP, 106, 3},
-	{ DBGBUS_DSPP, 106, 4},
-	{ DBGBUS_DSPP, 106, 5},
-	{ DBGBUS_DSPP, 106, 6},
-	{ DBGBUS_DSPP, 106, 7},
-
-	{ DBGBUS_DSPP, 109, 1},
-	{ DBGBUS_DSPP, 109, 2},
-	{ DBGBUS_DSPP, 109, 3},
-	{ DBGBUS_DSPP, 109, 4},
-	{ DBGBUS_DSPP, 109, 5},
-	{ DBGBUS_DSPP, 109, 6},
-	{ DBGBUS_DSPP, 109, 7},
-
-	{ DBGBUS_DSPP, 122, 1},
-	{ DBGBUS_DSPP, 122, 2},
-	{ DBGBUS_DSPP, 122, 3},
-	{ DBGBUS_DSPP, 122, 4},
-	{ DBGBUS_DSPP, 122, 5},
-	{ DBGBUS_DSPP, 122, 6},
-	{ DBGBUS_DSPP, 122, 7},
-
-	/* LM5 */
-	{ DBGBUS_DSPP, 124, 1},
-	{ DBGBUS_DSPP, 124, 2},
-	{ DBGBUS_DSPP, 124, 3},
-	{ DBGBUS_DSPP, 124, 4},
-	{ DBGBUS_DSPP, 124, 5},
-	{ DBGBUS_DSPP, 124, 6},
-	{ DBGBUS_DSPP, 124, 7, _sde_debug_bus_lm_dump },
-
-	{ DBGBUS_DSPP, 125, 1},
-	{ DBGBUS_DSPP, 125, 2},
-	{ DBGBUS_DSPP, 125, 3},
-	{ DBGBUS_DSPP, 125, 4},
-	{ DBGBUS_DSPP, 125, 5},
-	{ DBGBUS_DSPP, 125, 6},
-	{ DBGBUS_DSPP, 125, 7},
-
-	{ DBGBUS_DSPP, 126, 1},
-	{ DBGBUS_DSPP, 126, 2},
-	{ DBGBUS_DSPP, 126, 3},
-	{ DBGBUS_DSPP, 126, 4},
-	{ DBGBUS_DSPP, 126, 5},
-	{ DBGBUS_DSPP, 126, 6},
-	{ DBGBUS_DSPP, 126, 7},
-
-	{ DBGBUS_DSPP, 127, 1},
-	{ DBGBUS_DSPP, 127, 2},
-	{ DBGBUS_DSPP, 127, 3},
-	{ DBGBUS_DSPP, 127, 4},
-	{ DBGBUS_DSPP, 127, 5},
-	{ DBGBUS_DSPP, 127, 6},
-	{ DBGBUS_DSPP, 127, 7},
-
-	{ DBGBUS_DSPP, 128, 1},
-	{ DBGBUS_DSPP, 128, 2},
-	{ DBGBUS_DSPP, 128, 3},
-	{ DBGBUS_DSPP, 128, 4},
-	{ DBGBUS_DSPP, 128, 5},
-	{ DBGBUS_DSPP, 128, 6},
-	{ DBGBUS_DSPP, 128, 7},
-
-	{ DBGBUS_DSPP, 129, 1},
-	{ DBGBUS_DSPP, 129, 2},
-	{ DBGBUS_DSPP, 129, 3},
-	{ DBGBUS_DSPP, 129, 4},
-	{ DBGBUS_DSPP, 129, 5},
-	{ DBGBUS_DSPP, 129, 6},
-	{ DBGBUS_DSPP, 129, 7},
-
-	{ DBGBUS_DSPP, 131, 1},
-	{ DBGBUS_DSPP, 131, 2},
-	{ DBGBUS_DSPP, 131, 3},
-	{ DBGBUS_DSPP, 131, 4},
-	{ DBGBUS_DSPP, 131, 5},
-	{ DBGBUS_DSPP, 131, 6},
-	{ DBGBUS_DSPP, 131, 7},
-
-	{ DBGBUS_DSPP, 132, 1},
-	{ DBGBUS_DSPP, 132, 2},
-	{ DBGBUS_DSPP, 132, 3},
-	{ DBGBUS_DSPP, 132, 4},
-	{ DBGBUS_DSPP, 132, 5},
-	{ DBGBUS_DSPP, 132, 6},
-	{ DBGBUS_DSPP, 132, 7},
-
-	{ DBGBUS_DSPP, 133, 1},
-	{ DBGBUS_DSPP, 133, 2},
-	{ DBGBUS_DSPP, 133, 3},
-	{ DBGBUS_DSPP, 133, 4},
-	{ DBGBUS_DSPP, 133, 5},
-	{ DBGBUS_DSPP, 133, 6},
-	{ DBGBUS_DSPP, 133, 7},
-
-	{ DBGBUS_DSPP, 134, 1},
-	{ DBGBUS_DSPP, 134, 2},
-	{ DBGBUS_DSPP, 134, 3},
-	{ DBGBUS_DSPP, 134, 4},
-	{ DBGBUS_DSPP, 134, 5},
-	{ DBGBUS_DSPP, 134, 6},
-	{ DBGBUS_DSPP, 134, 7},
-
-	{ DBGBUS_DSPP, 135, 1},
-	{ DBGBUS_DSPP, 135, 2},
-	{ DBGBUS_DSPP, 135, 3},
-	{ DBGBUS_DSPP, 135, 4},
-	{ DBGBUS_DSPP, 135, 5},
-	{ DBGBUS_DSPP, 135, 6},
-	{ DBGBUS_DSPP, 135, 7},
-
-	/* csc */
-	{ DBGBUS_SSPP0, 7, 0},
-	{ DBGBUS_SSPP0, 7, 1},
-	{ DBGBUS_SSPP0, 7, 2},
-	{ DBGBUS_SSPP0, 27, 0},
-	{ DBGBUS_SSPP0, 27, 1},
-	{ DBGBUS_SSPP0, 27, 2},
-	{ DBGBUS_SSPP1, 7, 0},
-	{ DBGBUS_SSPP1, 7, 1},
-	{ DBGBUS_SSPP1, 7, 2},
-	{ DBGBUS_SSPP1, 27, 0},
-	{ DBGBUS_SSPP1, 27, 1},
-	{ DBGBUS_SSPP1, 27, 2},
-
-	/* pcc */
-	{ DBGBUS_SSPP0, 43, 3},
-	{ DBGBUS_SSPP0, 47, 3},
-	{ DBGBUS_SSPP1, 43, 3},
-	{ DBGBUS_SSPP1, 47, 3},
-
-	/* spa */
-	{ DBGBUS_SSPP0, 8,  0},
-	{ DBGBUS_SSPP0, 28, 0},
-	{ DBGBUS_SSPP1, 8,  0},
-	{ DBGBUS_SSPP1, 28, 0},
-
-	/* dspp pa */
-	{ DBGBUS_DSPP, 13, 0},
-	{ DBGBUS_DSPP, 19, 0},
-	{ DBGBUS_DSPP, 24, 0},
-	{ DBGBUS_DSPP, 37, 0},
-
-	/* igc */
-	{ DBGBUS_SSPP0, 39, 0},
-	{ DBGBUS_SSPP0, 39, 1},
-	{ DBGBUS_SSPP0, 39, 2},
-
-	{ DBGBUS_SSPP1, 39, 0},
-	{ DBGBUS_SSPP1, 39, 1},
-	{ DBGBUS_SSPP1, 39, 2},
-
-	{ DBGBUS_SSPP0, 46, 0},
-	{ DBGBUS_SSPP0, 46, 1},
-	{ DBGBUS_SSPP0, 46, 2},
-
-	{ DBGBUS_SSPP1, 46, 0},
-	{ DBGBUS_SSPP1, 46, 1},
-	{ DBGBUS_SSPP1, 46, 2},
-
-	{ DBGBUS_DSPP, 14, 0},
-	{ DBGBUS_DSPP, 14, 1},
-	{ DBGBUS_DSPP, 14, 2},
-	{ DBGBUS_DSPP, 20, 0},
-	{ DBGBUS_DSPP, 20, 1},
-	{ DBGBUS_DSPP, 20, 2},
-	{ DBGBUS_DSPP, 25, 0},
-	{ DBGBUS_DSPP, 25, 1},
-	{ DBGBUS_DSPP, 25, 2},
-	{ DBGBUS_DSPP, 38, 0},
-	{ DBGBUS_DSPP, 38, 1},
-	{ DBGBUS_DSPP, 38, 2},
-
-	/* rc0 */
-	{ DBGBUS_DSPP, 52, 0},
-	{ DBGBUS_DSPP, 52, 1},
-	{ DBGBUS_DSPP, 52, 2},
-	{ DBGBUS_DSPP, 52, 7},
-
-	/* rc1 */
-	{ DBGBUS_DSPP, 53, 0},
-	{ DBGBUS_DSPP, 53, 1},
-	{ DBGBUS_DSPP, 53, 2},
-	{ DBGBUS_DSPP, 53, 7},
-
-	/* spr0 */
-	{ DBGBUS_DSPP, 54, 2},
-	{ DBGBUS_DSPP, 54, 3},
-	{ DBGBUS_DSPP, 54, 4},
-	{ DBGBUS_DSPP, 54, 5},
-	{ DBGBUS_DSPP, 54, 6},
-	{ DBGBUS_DSPP, 54, 7},
-	{ DBGBUS_DSPP, 54, 8},
-	{ DBGBUS_DSPP, 54, 9},
-	{ DBGBUS_DSPP, 54, 10},
-	{ DBGBUS_DSPP, 54, 11},
-	{ DBGBUS_DSPP, 54, 12},
-	{ DBGBUS_DSPP, 54, 13},
-	{ DBGBUS_DSPP, 54, 31},
-
-	/* spr1 */
-	{ DBGBUS_DSPP, 55, 2},
-	{ DBGBUS_DSPP, 55, 3},
-	{ DBGBUS_DSPP, 55, 4},
-	{ DBGBUS_DSPP, 55, 5},
-	{ DBGBUS_DSPP, 55, 6},
-	{ DBGBUS_DSPP, 55, 7},
-	{ DBGBUS_DSPP, 55, 8},
-	{ DBGBUS_DSPP, 55, 9},
-	{ DBGBUS_DSPP, 55, 10},
-	{ DBGBUS_DSPP, 55, 11},
-	{ DBGBUS_DSPP, 55, 12},
-	{ DBGBUS_DSPP, 55, 13},
-	{ DBGBUS_DSPP, 55, 31},
-
-	/* demura0 */
-	{ DBGBUS_DSPP, 56, 0},
-	{ DBGBUS_DSPP, 56, 1},
-	{ DBGBUS_DSPP, 56, 2},
-	{ DBGBUS_DSPP, 56, 3},
-	{ DBGBUS_DSPP, 56, 4},
-	{ DBGBUS_DSPP, 56, 5},
-	{ DBGBUS_DSPP, 56, 6},
-	{ DBGBUS_DSPP, 56, 7},
-
-	/* demura1 */
-	{ DBGBUS_DSPP, 57, 0},
-	{ DBGBUS_DSPP, 57, 1},
-	{ DBGBUS_DSPP, 57, 2},
-	{ DBGBUS_DSPP, 57, 3},
-	{ DBGBUS_DSPP, 57, 4},
-	{ DBGBUS_DSPP, 57, 5},
-	{ DBGBUS_DSPP, 57, 6},
-	{ DBGBUS_DSPP, 57, 7},
-
-	/* intf0-3 */
-	{ DBGBUS_PERIPH, 0, 0},
-	{ DBGBUS_PERIPH, 1, 0},
-	{ DBGBUS_PERIPH, 2, 0},
-	{ DBGBUS_PERIPH, 3, 0},
-	{ DBGBUS_PERIPH, 4, 0},
-	{ DBGBUS_PERIPH, 5, 0},
-
-	/* te counter wrapper */
-	{ DBGBUS_PERIPH, 60, 0},
-	{ DBGBUS_PERIPH, 60, 1},
-	{ DBGBUS_PERIPH, 60, 2},
-	{ DBGBUS_PERIPH, 60, 3},
-	{ DBGBUS_PERIPH, 60, 4},
-	{ DBGBUS_PERIPH, 60, 5},
-
-	/* dsc0 */
-	{ DBGBUS_PERIPH, 47, 0},
-	{ DBGBUS_PERIPH, 47, 1},
-	{ DBGBUS_PERIPH, 47, 2},
-	{ DBGBUS_PERIPH, 47, 3},
-	{ DBGBUS_PERIPH, 47, 4},
-	{ DBGBUS_PERIPH, 47, 5},
-	{ DBGBUS_PERIPH, 47, 6},
-	{ DBGBUS_PERIPH, 47, 7},
-
-	/* dsc1 */
-	{ DBGBUS_PERIPH, 48, 0},
-	{ DBGBUS_PERIPH, 48, 1},
-	{ DBGBUS_PERIPH, 48, 2},
-	{ DBGBUS_PERIPH, 48, 3},
-	{ DBGBUS_PERIPH, 48, 4},
-	{ DBGBUS_PERIPH, 48, 5},
-	{ DBGBUS_PERIPH, 48, 6},
-	{ DBGBUS_PERIPH, 48, 7},
-
-	/* dsc2 */
-	{ DBGBUS_PERIPH, 50, 0},
-	{ DBGBUS_PERIPH, 50, 1},
-	{ DBGBUS_PERIPH, 50, 2},
-	{ DBGBUS_PERIPH, 50, 3},
-	{ DBGBUS_PERIPH, 50, 4},
-	{ DBGBUS_PERIPH, 50, 5},
-	{ DBGBUS_PERIPH, 50, 6},
-	{ DBGBUS_PERIPH, 50, 7},
-
-	/* dsc3 */
-	{ DBGBUS_PERIPH, 51, 0},
-	{ DBGBUS_PERIPH, 51, 1},
-	{ DBGBUS_PERIPH, 51, 2},
-	{ DBGBUS_PERIPH, 51, 3},
-	{ DBGBUS_PERIPH, 51, 4},
-	{ DBGBUS_PERIPH, 51, 5},
-	{ DBGBUS_PERIPH, 51, 6},
-	{ DBGBUS_PERIPH, 51, 7},
-
-	/* dsc4 */
-	{ DBGBUS_PERIPH, 52, 0},
-	{ DBGBUS_PERIPH, 52, 1},
-	{ DBGBUS_PERIPH, 52, 2},
-	{ DBGBUS_PERIPH, 52, 3},
-	{ DBGBUS_PERIPH, 52, 4},
-	{ DBGBUS_PERIPH, 52, 5},
-	{ DBGBUS_PERIPH, 52, 6},
-	{ DBGBUS_PERIPH, 52, 7},
-
-	/* dsc5 */
-	{ DBGBUS_PERIPH, 53, 0},
-	{ DBGBUS_PERIPH, 53, 1},
-	{ DBGBUS_PERIPH, 53, 2},
-	{ DBGBUS_PERIPH, 53, 3},
-	{ DBGBUS_PERIPH, 53, 4},
-	{ DBGBUS_PERIPH, 53, 5},
-	{ DBGBUS_PERIPH, 53, 6},
-	{ DBGBUS_PERIPH, 53, 7},
-
-	/* tear-check */
-	/* INTF_0 */
-	{ DBGBUS_PERIPH, 63, 0 },
-	{ DBGBUS_PERIPH, 63, 1 },
-	{ DBGBUS_PERIPH, 63, 2 },
-	{ DBGBUS_PERIPH, 63, 3 },
-	{ DBGBUS_PERIPH, 63, 4 },
-	{ DBGBUS_PERIPH, 63, 5 },
-	{ DBGBUS_PERIPH, 63, 6 },
-	{ DBGBUS_PERIPH, 63, 7 },
-
-	/* INTF_1 */
-	{ DBGBUS_PERIPH, 64, 0 },
-	{ DBGBUS_PERIPH, 64, 1 },
-	{ DBGBUS_PERIPH, 64, 2 },
-	{ DBGBUS_PERIPH, 64, 3 },
-	{ DBGBUS_PERIPH, 64, 4 },
-	{ DBGBUS_PERIPH, 64, 5 },
-	{ DBGBUS_PERIPH, 64, 6 },
-	{ DBGBUS_PERIPH, 64, 7 },
-
-	/* INTF_2 */
-	{ DBGBUS_PERIPH, 65, 0 },
-	{ DBGBUS_PERIPH, 65, 1 },
-	{ DBGBUS_PERIPH, 65, 2 },
-	{ DBGBUS_PERIPH, 65, 3 },
-	{ DBGBUS_PERIPH, 65, 4 },
-	{ DBGBUS_PERIPH, 65, 5 },
-	{ DBGBUS_PERIPH, 65, 6 },
-	{ DBGBUS_PERIPH, 65, 7 },
-
-	/* INTF_4 */
-	{ DBGBUS_PERIPH, 66, 0 },
-	{ DBGBUS_PERIPH, 66, 1 },
-	{ DBGBUS_PERIPH, 66, 2 },
-	{ DBGBUS_PERIPH, 66, 3 },
-	{ DBGBUS_PERIPH, 66, 4 },
-	{ DBGBUS_PERIPH, 66, 5 },
-	{ DBGBUS_PERIPH, 66, 6 },
-	{ DBGBUS_PERIPH, 66, 7 },
-
-	/* INTF_5 */
-	{ DBGBUS_PERIPH, 67, 0 },
-	{ DBGBUS_PERIPH, 67, 1 },
-	{ DBGBUS_PERIPH, 67, 2 },
-	{ DBGBUS_PERIPH, 67, 3 },
-	{ DBGBUS_PERIPH, 67, 4 },
-	{ DBGBUS_PERIPH, 67, 5 },
-	{ DBGBUS_PERIPH, 67, 6 },
-	{ DBGBUS_PERIPH, 67, 7 },
-
-	/* INTF_3 */
-	{ DBGBUS_PERIPH, 73, 0 },
-	{ DBGBUS_PERIPH, 73, 1 },
-	{ DBGBUS_PERIPH, 73, 2 },
-	{ DBGBUS_PERIPH, 73, 3 },
-	{ DBGBUS_PERIPH, 73, 4 },
-	{ DBGBUS_PERIPH, 73, 5 },
-	{ DBGBUS_PERIPH, 73, 6 },
-	{ DBGBUS_PERIPH, 73, 7 },
-
-	/* cdwn */
-	{ DBGBUS_PERIPH, 80, 0},
-	{ DBGBUS_PERIPH, 80, 1},
-	{ DBGBUS_PERIPH, 80, 2},
-
-	{ DBGBUS_PERIPH, 81, 0},
-	{ DBGBUS_PERIPH, 81, 1},
-	{ DBGBUS_PERIPH, 81, 2},
-
-	{ DBGBUS_PERIPH, 82, 0},
-	{ DBGBUS_PERIPH, 82, 1},
-	{ DBGBUS_PERIPH, 82, 2},
-	{ DBGBUS_PERIPH, 82, 3},
-	{ DBGBUS_PERIPH, 82, 4},
-	{ DBGBUS_PERIPH, 82, 5},
-	{ DBGBUS_PERIPH, 82, 6},
-	{ DBGBUS_PERIPH, 82, 7},
-
-	/* DPTX1 */
-	{ DBGBUS_PERIPH, 68, 0},
-	{ DBGBUS_PERIPH, 68, 1},
-	{ DBGBUS_PERIPH, 68, 2},
-	{ DBGBUS_PERIPH, 68, 3},
-	{ DBGBUS_PERIPH, 68, 4},
-	{ DBGBUS_PERIPH, 68, 5},
-	{ DBGBUS_PERIPH, 68, 6},
-	{ DBGBUS_PERIPH, 68, 7},
-
-	/* DP */
-	{ DBGBUS_PERIPH, 69, 0},
-	{ DBGBUS_PERIPH, 69, 1},
-	{ DBGBUS_PERIPH, 69, 2},
-	{ DBGBUS_PERIPH, 69, 3},
-	{ DBGBUS_PERIPH, 69, 4},
-	{ DBGBUS_PERIPH, 69, 5},
-
-	/* dsi0 */
-	{ DBGBUS_PERIPH, 70, 0},
-	{ DBGBUS_PERIPH, 70, 1},
-	{ DBGBUS_PERIPH, 70, 2},
-	{ DBGBUS_PERIPH, 70, 3},
-	{ DBGBUS_PERIPH, 70, 4},
-	{ DBGBUS_PERIPH, 70, 5},
-
-	/* dsi1 */
-	{ DBGBUS_PERIPH, 71, 0},
-	{ DBGBUS_PERIPH, 71, 1},
-	{ DBGBUS_PERIPH, 71, 2},
-	{ DBGBUS_PERIPH, 71, 3},
-	{ DBGBUS_PERIPH, 71, 4},
-	{ DBGBUS_PERIPH, 71, 5},
-
-	/* eDP */
-	{ DBGBUS_PERIPH, 72, 0},
-	{ DBGBUS_PERIPH, 72, 1},
-	{ DBGBUS_PERIPH, 72, 2},
-	{ DBGBUS_PERIPH, 72, 3},
-	{ DBGBUS_PERIPH, 72, 4},
-	{ DBGBUS_PERIPH, 72, 5},
-
-};
-
-static struct vbif_debug_bus_entry vbif_dbg_bus_msm8998[] = {
+static struct vbif_debug_bus_entry vbif_dbg_bus[] = {
 	{0x214, 0x21c, 16, 2, 0x0, 0xd},     /* arb clients */
 	{0x214, 0x21c, 16, 2, 0x80, 0xc0},   /* arb clients */
 	{0x214, 0x21c, 16, 2, 0x100, 0x140}, /* arb clients */
@@ -4258,7 +383,7 @@ static struct vbif_debug_bus_entry vbif_dbg_bus_msm8998[] = {
 	{0x21c, 0x214, 0, 14, 0, 0xc}, /* xin blocks - clock side */
 };
 
-static struct dsi_debug_bus_entry dsi_dbg_bus_kona[] = {
+static struct dsi_debug_bus_entry dsi_dbg_bus[] = {
 	{0, 0x00}, {1, 0x00}, {2, 0x00}, {3, 0x00},
 	{0, 0x01}, {1, 0x01}, {2, 0x01}, {3, 0x01},
 	{0, 0x02}, {1, 0x02}, {2, 0x02}, {3, 0x02},
@@ -4310,7 +435,7 @@ static struct dsi_debug_bus_entry dsi_dbg_bus_kona[] = {
 	{0, 0x3c}, {0, 0x3d}, {0, 0x3e}, {0, 0x3f},
 };
 
-static struct lutdma_debug_bus_entry dbg_bus_lutdma_lahaina[] = {
+static struct lutdma_debug_bus_entry dbg_bus_lutdma[] = {
 	{ DBGBUS_LUTDMA_0, false, 1024 },
 	{ DBGBUS_LUTDMA_0, true, 1024 },
 	{ DBGBUS_LUTDMA_1, false, 1024 },
@@ -4600,23 +725,85 @@ static struct sde_dbg_reg_base *_sde_dump_get_blk_addr(const char *blk_name)
 	return NULL;
 }
 
+static void _sde_dbg_dump_sde_bus_entry(
+		struct sde_debug_bus_entry *head, void __iomem *mem_base,
+		u32 *dump_addr, struct sde_dbg_sde_debug_bus *bus, bool in_log,
+		bool in_mem)
+{
+	int i, j;
+	u32 status = 0;
+	u32 offset;
+
+	if (!dump_addr && !in_log && !in_mem)
+		return;
+
+	for (i = 0; i < head->block_id_max_cnt; i++) {
+		for (j = 0; j < head->test_id_max_cnt; j++) {
+			if (head->test_id + j > EXT_TEST_GROUP_SEL_EN)
+				writel_relaxed(TEST_EXT_MASK(
+						(head->block_id + i),
+						(head->test_id + j)),
+						mem_base + head->wr_addr);
+			else
+				writel_relaxed(TEST_MASK((head->block_id + i),
+						(head->test_id + j)),
+						mem_base + head->wr_addr);
+			wmb(); /* make sure test bits were written */
+
+			if (bus->cmn.flags & DBGBUS_FLAGS_DSPP) {
+				offset = DBGBUS_DSPP_STATUS;
+				/* keep DSPP test point enabled */
+				if (head->wr_addr != DBGBUS_DSPP)
+					writel_relaxed(DSPP_DEBUGBUS_CTRL_EN,
+					mem_base + DBGBUS_DSPP);
+			} else {
+				offset = head->wr_addr + 0x4;
+			}
+
+			status = readl_relaxed(mem_base + offset);
+
+			if (in_log)
+				dev_info(sde_dbg_base.dev,
+						"waddr=0x%x blk=%d tst=%d val=0x%x\n",
+						head->wr_addr,
+						head->block_id + i,
+						head->test_id + j, status);
+
+			if (dump_addr && in_mem) {
+				*dump_addr++ = head->wr_addr;
+				*dump_addr++ = head->block_id + i;
+				*dump_addr++ = head->test_id + j;
+				*dump_addr++ = status;
+			}
+
+			if (head->analyzer)
+				head->analyzer(mem_base, head, status, i, j);
+
+			/* Disable debug bus once we are done */
+			writel_relaxed(0x0, mem_base + head->wr_addr);
+			if (bus->cmn.flags & DBGBUS_FLAGS_DSPP &&
+					head->wr_addr != DBGBUS_DSPP)
+				writel_relaxed(0x0, mem_base + DBGBUS_DSPP);
+		}
+	}
+}
+
 static void _sde_dbg_dump_sde_dbg_bus(struct sde_dbg_sde_debug_bus *bus)
 {
 	bool in_log, in_mem;
 	u32 **dump_mem = NULL;
 	u32 *dump_addr = NULL;
-	u32 status = 0;
+	u32 bus_size;
 	struct sde_debug_bus_entry *head;
-	int list_size;
+	struct sde_debug_bus_entry *dbg_bus;
+	int list_size = 0;
 	int i;
-	u32 offset;
 	void __iomem *mem_base = NULL;
 	struct sde_dbg_reg_base *reg_base;
 	int rc;
 
 	if (!bus || !bus->cmn.entries_size)
 		return;
-
 	list_for_each_entry(reg_base, &sde_dbg_base.reg_base_list,
 			reg_base_head)
 		if (strlen(reg_base->name) &&
@@ -4628,10 +815,20 @@ static void _sde_dbg_dump_sde_dbg_bus(struct sde_dbg_sde_debug_bus *bus)
 		return;
 	}
 
+	dbg_bus = bus->entries;
+	bus_size = bus->cmn.entries_size;
 	dump_mem = &bus->cmn.dumped_content;
 
-	/* will keep in memory 4 entries of 4 bytes each */
-	list_size = (bus->cmn.entries_size * 4 * 4);
+	if (!dump_mem || !dbg_bus || !bus_size)
+		return;
+
+	/* allocate memory for each test id */
+	for (i = 0; i < bus_size; i++) {
+		head = dbg_bus + i;
+		list_size += (head->block_id_max_cnt * head->test_id_max_cnt);
+	}
+
+	list_size *= 16;
 
 	in_log = (bus->cmn.enable_mask & SDE_DBG_DUMP_IN_LOG);
 	in_mem = (bus->cmn.enable_mask & SDE_DBG_DUMP_IN_MEM);
@@ -4666,48 +863,13 @@ static void _sde_dbg_dump_sde_dbg_bus(struct sde_dbg_sde_debug_bus *bus)
 		return;
 	}
 
-	for (i = 0; i < bus->cmn.entries_size; i++) {
-		head = bus->entries + i;
-		if (head->test_id > 0x7)
-			writel_relaxed(TEST_EXT_MASK(head->block_id,
-				head->test_id), mem_base + head->wr_addr);
-		else
-			writel_relaxed(TEST_MASK(head->block_id, head->test_id),
-				mem_base + head->wr_addr);
-		wmb(); /* make sure test bits were written */
-
-		if (bus->cmn.flags & DBGBUS_FLAGS_DSPP) {
-			offset = DBGBUS_DSPP_STATUS;
-			/* keep DSPP test point enabled */
-			if (head->wr_addr != DBGBUS_DSPP)
-				writel_relaxed(0x7001, mem_base + DBGBUS_DSPP);
-		} else {
-			offset = head->wr_addr + 0x4;
-		}
-
-		status = readl_relaxed(mem_base + offset);
-
-		if (in_log)
-			dev_info(sde_dbg_base.dev,
-					"waddr=0x%x blk=%d tst=%d val=0x%x\n",
-					head->wr_addr, head->block_id,
-					head->test_id, status);
-
-		if (dump_addr && in_mem) {
-			dump_addr[i*4]     = head->wr_addr;
-			dump_addr[i*4 + 1] = head->block_id;
-			dump_addr[i*4 + 2] = head->test_id;
-			dump_addr[i*4 + 3] = status;
-		}
-
-		if (head->analyzer)
-			head->analyzer(mem_base, head, status);
-
-		/* Disable debug bus once we are done */
-		writel_relaxed(0, mem_base + head->wr_addr);
-		if (bus->cmn.flags & DBGBUS_FLAGS_DSPP &&
-						head->wr_addr != DBGBUS_DSPP)
-			writel_relaxed(0x0, mem_base + DBGBUS_DSPP);
+	for (i = 0; i < bus_size; i++) {
+		head = dbg_bus + i;
+		_sde_dbg_dump_sde_bus_entry(head, mem_base, dump_addr,
+				bus, in_log, in_mem);
+		if (dump_addr)
+			dump_addr += (head->block_id_max_cnt *
+					head->test_id_max_cnt * 4);
 	}
 	pm_runtime_put_sync(sde_dbg_base.dev);
 
@@ -6269,69 +2431,29 @@ void sde_dbg_init_dbg_buses(u32 hwversion)
 	memset(&dbg->dbgbus_sde, 0, sizeof(dbg->dbgbus_sde));
 	memset(&dbg->dbgbus_vbif_rt, 0, sizeof(dbg->dbgbus_vbif_rt));
 
-	if (SDE_HW_REV_MAJOR(hwversion) == 0x7) {
-		dbg->dbgbus_sde.entries = dbg_bus_sde_lahaina;
-		dbg->dbgbus_sde.cmn.entries_size =
-				ARRAY_SIZE(dbg_bus_sde_lahaina);
-		dbg->dbgbus_sde.cmn.flags = DBGBUS_FLAGS_DSPP;
-		dbg->dbgbus_sde.cmn.name = DBGBUS_NAME_SDE;
-		dbg->dbgbus_sde.cmn.enable_mask = DEFAULT_DBGBUS_SDE;
+	dbg->dbgbus_sde.entries = dbg_bus_sde;
+	dbg->dbgbus_sde.cmn.entries_size = ARRAY_SIZE(dbg_bus_sde);
+	dbg->dbgbus_sde.cmn.flags = DBGBUS_FLAGS_DSPP;
+	dbg->dbgbus_sde.cmn.name = DBGBUS_NAME_SDE;
+	dbg->dbgbus_sde.cmn.enable_mask = DEFAULT_DBGBUS_SDE;
 
-		dbg->dbgbus_vbif_rt.entries = vbif_dbg_bus_msm8998;
-		dbg->dbgbus_vbif_rt.cmn.entries_size =
-				ARRAY_SIZE(vbif_dbg_bus_msm8998);
-		dbg->dbgbus_vbif_rt.cmn.name = DBGBUS_NAME_VBIF_RT;
-		dbg->dbgbus_vbif_rt.cmn.enable_mask = DEFAULT_DBGBUS_VBIFRT;
+	dbg->dbgbus_vbif_rt.entries = vbif_dbg_bus;
+	dbg->dbgbus_vbif_rt.cmn.entries_size = ARRAY_SIZE(vbif_dbg_bus);
+	dbg->dbgbus_vbif_rt.cmn.name = DBGBUS_NAME_VBIF_RT;
+	dbg->dbgbus_vbif_rt.cmn.enable_mask = DEFAULT_DBGBUS_VBIFRT;
 
-		dbg->dbgbus_dsi.entries = dsi_dbg_bus_kona;
-		dbg->dbgbus_dsi.cmn.entries_size =
-				ARRAY_SIZE(dsi_dbg_bus_kona);
-		dbg->dbgbus_dsi.cmn.name = DBGBUS_NAME_DSI;
-		dbg->dbgbus_dsi.cmn.enable_mask = DEFAULT_DBGBUS_DSI;
+	dbg->dbgbus_dsi.entries = dsi_dbg_bus;
+	dbg->dbgbus_dsi.cmn.entries_size = ARRAY_SIZE(dsi_dbg_bus);
+	dbg->dbgbus_dsi.cmn.name = DBGBUS_NAME_DSI;
+	dbg->dbgbus_dsi.cmn.enable_mask = DEFAULT_DBGBUS_DSI;
 
-		dbg->dbgbus_lutdma.entries = dbg_bus_lutdma_lahaina;
+	if (SDE_HW_REV_MAJOR(hwversion) >= 0x7) {
+		dbg->dbgbus_lutdma.entries = dbg_bus_lutdma;
 		dbg->dbgbus_lutdma.cmn.name = DBGBUS_NAME_LUTDMA;
 		dbg->dbgbus_lutdma.cmn.entries_size =
-				ARRAY_SIZE(dbg_bus_lutdma_lahaina);
+				ARRAY_SIZE(dbg_bus_lutdma);
 		dbg->dbgbus_lutdma.cmn.enable_mask = DEFAULT_DBGBUS_LUTDMA;
 		dbg->dbgbus_lutdma.cmn.include_in_deferred_work = true;
-	} else if (SDE_HW_REV_MAJOR(hwversion) == 0x6) {
-		dbg->dbgbus_sde.entries = dbg_bus_sde_kona;
-		dbg->dbgbus_sde.cmn.entries_size =
-				ARRAY_SIZE(dbg_bus_sde_kona);
-		dbg->dbgbus_sde.cmn.flags = DBGBUS_FLAGS_DSPP;
-		dbg->dbgbus_sde.cmn.name = DBGBUS_NAME_SDE;
-		dbg->dbgbus_sde.cmn.enable_mask = DEFAULT_DBGBUS_SDE;
-
-		dbg->dbgbus_vbif_rt.entries = vbif_dbg_bus_msm8998;
-		dbg->dbgbus_vbif_rt.cmn.entries_size =
-				ARRAY_SIZE(vbif_dbg_bus_msm8998);
-		dbg->dbgbus_vbif_rt.cmn.name = DBGBUS_NAME_VBIF_RT;
-		dbg->dbgbus_vbif_rt.cmn.enable_mask = DEFAULT_DBGBUS_VBIFRT;
-
-		dbg->dbgbus_dsi.entries = dsi_dbg_bus_kona;
-		dbg->dbgbus_dsi.cmn.entries_size =
-				ARRAY_SIZE(dsi_dbg_bus_kona);
-		dbg->dbgbus_dsi.cmn.name = DBGBUS_NAME_DSI;
-		dbg->dbgbus_dsi.cmn.enable_mask = DEFAULT_DBGBUS_DSI;
-	} else if (SDE_HW_REV_MAJOR(hwversion) == 0x5) {
-		dbg->dbgbus_sde.entries = dbg_bus_sde_sm8150;
-		dbg->dbgbus_sde.cmn.entries_size =
-				ARRAY_SIZE(dbg_bus_sde_sm8150);
-		dbg->dbgbus_sde.cmn.flags = DBGBUS_FLAGS_DSPP;
-		dbg->dbgbus_sde.cmn.name = DBGBUS_NAME_SDE;
-		dbg->dbgbus_sde.cmn.enable_mask = DEFAULT_DBGBUS_SDE;
-
-		dbg->dbgbus_vbif_rt.entries = vbif_dbg_bus_msm8998;
-		dbg->dbgbus_vbif_rt.cmn.entries_size =
-				ARRAY_SIZE(vbif_dbg_bus_msm8998);
-		dbg->dbgbus_vbif_rt.cmn.name = DBGBUS_NAME_VBIF_RT;
-		dbg->dbgbus_vbif_rt.cmn.enable_mask = DEFAULT_DBGBUS_VBIFRT;
-
-		dbg->dbgbus_dsi.entries = NULL;
-		dbg->dbgbus_dsi.cmn.entries_size = 0;
-	} else {
-		pr_err("unsupported chipset id %X\n", hwversion);
 	}
 }