Merge "msm: ipa3: Changes to remove the CNTXT_SCRATCH_1 config"

This commit is contained in:
qctecmdr
2021-08-03 17:33:43 -07:00
committed by Gerrit - the friendly Code Review server
3 changed files with 0 additions and 14 deletions

View File

@@ -1559,9 +1559,6 @@ int gsi_register_device(struct gsi_per_props *props, unsigned long *dev_hdl)
if (gsi_ctx->per.ver >= GSI_VER_1_2)
gsihal_write_reg_n(GSI_EE_n_ERROR_LOG, gsi_ctx->per.ee, 0);
/* Reset to zero scratch_1 register*/
gsihal_write_reg_n(GSI_EE_n_CNTXT_SCRATCH_1, gsi_ctx->per.ee, 0);
if (running_emulation) {
/*
* Set up the emulator's interrupt controller...

View File

@@ -60,7 +60,6 @@ static const char *gsireg_name_to_str[GSI_REG_MAX] = {
__stringify(GSI_EE_n_CNTXT_MSI_BASE_MSB),
__stringify(GSI_EE_n_GSI_STATUS),
__stringify(GSI_EE_n_CNTXT_SCRATCH_0),
__stringify(GSI_EE_n_CNTXT_SCRATCH_1),
__stringify(GSI_EE_n_EV_CH_k_CNTXT_1),
__stringify(GSI_EE_n_EV_CH_k_CNTXT_2),
__stringify(GSI_EE_n_EV_CH_k_CNTXT_3),
@@ -1220,9 +1219,6 @@ static struct gsihal_reg_obj gsihal_reg_objs[GSI_VER_MAX][GSI_REG_MAX] = {
[GSI_VER_1_0][GSI_EE_n_CNTXT_SCRATCH_0] = {
gsireg_construct_dummy, gsireg_parse_dummy,
0x0001f400, 0x4000, 0},
[GSI_VER_1_0][GSI_EE_n_CNTXT_SCRATCH_1] = {
gsireg_construct_dummy, gsireg_parse_dummy,
0x0001f404, 0x4000, 0},
[GSI_VER_1_0][GSI_EE_n_EV_CH_k_CNTXT_1] = {
gsireg_construct_ev_ch_k_cntxt_1, gsireg_parse_dummy,
0x0001d004, 0x4000, 0x80},
@@ -1578,9 +1574,6 @@ static struct gsihal_reg_obj gsihal_reg_objs[GSI_VER_MAX][GSI_REG_MAX] = {
[GSI_VER_2_5][GSI_EE_n_CNTXT_SCRATCH_0] = {
gsireg_construct_dummy, gsireg_parse_dummy,
0x00012400, 0x4000, 0},
[GSI_VER_2_5][GSI_EE_n_CNTXT_SCRATCH_1] = {
gsireg_construct_dummy, gsireg_parse_dummy,
0x00012404, 0x4000, 0},
[GSI_VER_2_5][GSI_EE_n_EV_CH_k_CNTXT_1] = {
gsireg_construct_ev_ch_k_cntxt_1, gsireg_parse_dummy,
0x00010004, 0x4000, 0x80},
@@ -1962,9 +1955,6 @@ static struct gsihal_reg_obj gsihal_reg_objs[GSI_VER_MAX][GSI_REG_MAX] = {
[GSI_VER_3_0][GSI_EE_n_CNTXT_SCRATCH_0] = {
gsireg_construct_dummy, gsireg_parse_dummy,
0x00025400, 0x12000, 0},
[GSI_VER_3_0][GSI_EE_n_CNTXT_SCRATCH_1] = {
gsireg_construct_dummy, gsireg_parse_dummy,
0x00024504, 0x12000, 0},
[GSI_VER_3_0][GSI_INTER_EE_n_SRC_GSI_CH_IRQ_k] = {
gsireg_construct_dummy, gsireg_parse_dummy,
0x0000c018, 0x1000, 0x18 },

View File

@@ -50,7 +50,6 @@ enum gsihal_reg_name {
GSI_EE_n_CNTXT_MSI_BASE_MSB,
GSI_EE_n_GSI_STATUS,
GSI_EE_n_CNTXT_SCRATCH_0,
GSI_EE_n_CNTXT_SCRATCH_1,
GSI_EE_n_EV_CH_k_CNTXT_1,
GSI_EE_n_EV_CH_k_CNTXT_2,
GSI_EE_n_EV_CH_k_CNTXT_3,