fix(mt8196): remove SPM support for ES chip
We no longer maintain the device equipped with ES chip. Remove SPM
support for ES ship.
Change-Id: I5b2d035ec384a9861239f33dbe6df54c17f1285c
diff --git a/plat/mediatek/drivers/spm/mt8196/mt_spm.c b/plat/mediatek/drivers/spm/mt8196/mt_spm.c
index fee5b4c..9b1dc92 100644
--- a/plat/mediatek/drivers/spm/mt8196/mt_spm.c
+++ b/plat/mediatek/drivers/spm/mt8196/mt_spm.c
@@ -50,8 +50,6 @@
#define plat_spm_lock_init()
#endif
-uint32_t mt_spm_version;
-
static uint32_t spm_irq_num;
void spm_set_sysclk_settle(void)
@@ -456,9 +454,7 @@
spm_irq_num = 0xFFFFFFFF;
- INFO("[%s:%d] - spm finished, version = %u, PC = 0x%x\n",
- __func__, __LINE__,
- mt_spm_version, mmio_read_32(MD32PCM_PC));
+ INFO("[%s], PC = 0x%x\n", __func__, mmio_read_32(MD32PCM_PC));
return 0;
}
MTK_PLAT_SETUP_1_INIT(spm_boot_init);
diff --git a/plat/mediatek/drivers/spm/mt8196/mt_spm.h b/plat/mediatek/drivers/spm/mt8196/mt_spm.h
index bc6fa44..bd5fd9c 100644
--- a/plat/mediatek/drivers/spm/mt8196/mt_spm.h
+++ b/plat/mediatek/drivers/spm/mt8196/mt_spm.h
@@ -28,9 +28,6 @@
#define MT_SPM_TIME_GET(tm) ({ (tm) = el3_uptime(); })
-#define MT_SPM_VERSION_ES 0x0
-#define MT_SPM_VERSION_CS 0x1
-
#define SPM_FW_NO_RESUME 1
#define MCUSYS_MTCMOS_ON 0
#define WAKEUP_LOG_ON 0
@@ -138,7 +135,6 @@
void mt_spm_set_common_sodi_pcm_flags(void);
int spm_boot_init(void);
void spm_dvfsfw_init(uint64_t boot_up_opp, uint64_t dram_issue);
-extern uint32_t mt_spm_version;
extern struct pwr_ctrl spm_init_ctrl;
/* Support by bl31_plat_setup.c */
uint32_t is_abnormal_boot(void);
diff --git a/plat/mediatek/drivers/spm/mt8196/mt_spm_conservation.c b/plat/mediatek/drivers/spm/mt8196/mt_spm_conservation.c
index 16d9f29..0365e83 100644
--- a/plat/mediatek/drivers/spm/mt8196/mt_spm_conservation.c
+++ b/plat/mediatek/drivers/spm/mt8196/mt_spm_conservation.c
@@ -58,14 +58,10 @@
#if defined(CONFIG_MTK_VCOREDVFS_SUPPORT)
__spm_sync_vcore_dvfs_power_control(pwrctrl, __spm_vcorefs.pwrctrl);
#endif
- if (mt_spm_version == MT_SPM_VERSION_ES)
- pwrctrl->pcm_flags |= (SPM_FLAG_ENABLE_MT8196_E1_WA |
- SPM_FLAG_ENABLE_MT8196_EMI_E1_WA);
#ifdef MTK_SPM_IVI_SUPPORT
pwrctrl->pcm_flags |= SPM_FLAG_ENABLE_MT8196_IVI;
#endif
-
__spm_set_pcm_flags(pwrctrl);
#ifdef HW_S1_DETECT