diff --git a/drivers/platform/msm/gsi/gsi.c b/drivers/platform/msm/gsi/gsi.c
index d9bd57f9b3b2..6663e79dc528 100644
--- a/drivers/platform/msm/gsi/gsi.c
+++ b/drivers/platform/msm/gsi/gsi.c
@@ -1367,10 +1367,6 @@ int gsi_register_device(struct gsi_per_props *props, unsigned long *dev_hdl)
 		gsi_writel(0, gsi_ctx->base +
 			GSI_EE_n_ERROR_LOG_OFFS(gsi_ctx->per.ee));
 
-	/* Reset to zero scratch_1 register*/
-	gsi_writel(0, gsi_ctx->base +
-			GSI_EE_n_CNTXT_SCRATCH_1_OFFS(gsi_ctx->per.ee));
-
 	if (running_emulation) {
 		/*
 		 * Set up the emulator's interrupt controller...
diff --git a/drivers/platform/msm/gsi/gsi_reg_v1.h b/drivers/platform/msm/gsi/gsi_reg_v1.h
index ee3de12fa3f8..8d3052f4db34 100644
--- a/drivers/platform/msm/gsi/gsi_reg_v1.h
+++ b/drivers/platform/msm/gsi/gsi_reg_v1.h
@@ -1177,11 +1177,6 @@
 #define GSI_EE_n_CNTXT_SCRATCH_0_SCRATCH_BMSK 0xffffffff
 #define GSI_EE_n_CNTXT_SCRATCH_0_SCRATCH_SHFT 0x0
 
-#define GSI_EE_n_CNTXT_SCRATCH_1_OFFS(n) \
-	(GSI_GSI_REG_BASE_OFFS + 0x0001f404 + 0x4000 * (n))
-#define GSI_EE_n_CNTXT_SCRATCH_1_SCRATCH_BMSK 0xffffffff
-#define GSI_EE_n_CNTXT_SCRATCH_1_SCRATCH_SHFT 0x0
-
 #define GSI_INTER_EE_n_SRC_GSI_CH_IRQ_OFFS(n) \
 	(GSI_GSI_REG_BASE_OFFS + 0x0000c018 + 0x1000 * (n))
 #define GSI_INTER_EE_n_SRC_GSI_CH_IRQ_GSI_CH_BIT_MAP_BMSK 0xffffffff
diff --git a/drivers/platform/msm/gsi/gsi_reg_v2.h b/drivers/platform/msm/gsi/gsi_reg_v2.h
index 11ce1c435969..459c0ba7c42f 100644
--- a/drivers/platform/msm/gsi/gsi_reg_v2.h
+++ b/drivers/platform/msm/gsi/gsi_reg_v2.h
@@ -1180,11 +1180,6 @@
 #define GSI_EE_n_CNTXT_SCRATCH_0_SCRATCH_BMSK 0xffffffff
 #define GSI_EE_n_CNTXT_SCRATCH_0_SCRATCH_SHFT 0x0
 
-#define GSI_EE_n_CNTXT_SCRATCH_1_OFFS(n) \
-	(GSI_GSI_REG_BASE_OFFS + 0x00012404 + 0x4000 * (n))
-#define GSI_EE_n_CNTXT_SCRATCH_1_SCRATCH_BMSK 0xffffffff
-#define GSI_EE_n_CNTXT_SCRATCH_1_SCRATCH_SHFT 0x0
-
 #define GSI_INTER_EE_n_SRC_GSI_CH_IRQ_OFFS(n) \
 	(GSI_GSI_REG_BASE_OFFS + 0x0000c018 + 0x1000 * (n))
 #define GSI_INTER_EE_n_SRC_GSI_CH_IRQ_GSI_CH_BIT_MAP_BMSK 0xffffffff