Attention is currently required from: Hung-Te Lin, Weiyi Lu.
Rex-BC Chen would like Weiyi Lu to review this change.
soc/mediatek/mt8195: Add mtcmos init support
Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
Change-Id: If7cd1f596f1406fa21d6586510e9956bb9846a6f
---
M src/soc/mediatek/common/include/soc/mtcmos.h
M src/soc/mediatek/common/mtcmos.c
M src/soc/mediatek/mt8195/Makefile.inc
M src/soc/mediatek/mt8195/include/soc/spm.h
A src/soc/mediatek/mt8195/mtcmos.c
5 files changed, 137 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/52882/1
diff --git a/src/soc/mediatek/common/include/soc/mtcmos.h b/src/soc/mediatek/common/include/soc/mtcmos.h
index 0e0e32a..20de4ea 100644
--- a/src/soc/mediatek/common/include/soc/mtcmos.h
+++ b/src/soc/mediatek/common/include/soc/mtcmos.h
@@ -8,8 +8,11 @@
u32 pwr_sta_mask;
u32 sram_pdn_mask;
u32 sram_ack_mask;
+ u32 caps;
};
+#define SCPD_SRAM_ISO (1U << 0)
+
void mtcmos_audio_power_on(void);
void mtcmos_display_power_on(void);
diff --git a/src/soc/mediatek/common/mtcmos.c b/src/soc/mediatek/common/mtcmos.c
index 17a464f..6be7b1c 100644
--- a/src/soc/mediatek/common/mtcmos.c
+++ b/src/soc/mediatek/common/mtcmos.c
@@ -33,6 +33,12 @@
while (read32(pd->pwr_con) & pd->sram_ack_mask)
continue;
+
+ if (pd->caps & SCPD_SRAM_ISO) {
+ setbits32(pd->pwr_con, SRAM_ISOINT_B);
+ udelay(1);
+ clrbits32(pd->pwr_con, SRAM_CKISO);
+ }
}
void mtcmos_display_power_on(void)
diff --git a/src/soc/mediatek/mt8195/Makefile.inc b/src/soc/mediatek/mt8195/Makefile.inc
index 0c5b9cf..796c335 100644
--- a/src/soc/mediatek/mt8195/Makefile.inc
+++ b/src/soc/mediatek/mt8195/Makefile.inc
@@ -35,6 +35,7 @@
ramstage-y += emi.c
ramstage-y += ../common/flash_controller.c
ramstage-y += ../common/gpio.c gpio.c
+ramstage-y += ../common/mtcmos.c mtcmos.c
ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
ramstage-y += soc.c
ramstage-y += ../common/timer.c timer.c
diff --git a/src/soc/mediatek/mt8195/include/soc/spm.h b/src/soc/mediatek/mt8195/include/soc/spm.h
index c90e632..319509a 100644
--- a/src/soc/mediatek/mt8195/include/soc/spm.h
+++ b/src/soc/mediatek/mt8195/include/soc/spm.h
@@ -4,8 +4,13 @@
#define SOC_MEDIATEK_MT8195_SPM_H
#include <soc/addressmap.h>
+#include <soc/mtcmos.h>
#include <types.h>
+/* SPM READ/WRITE CFG */
+#define SPM_PROJECT_CODE 0xb16
+#define SPM_REGWR_CFG_KEY (SPM_PROJECT_CODE << 16)
+
struct mtk_spm_regs {
u32 poweron_config_set;
u32 spm_power_on_val0;
@@ -528,9 +533,54 @@
u32 spm_pmsr_len_con2;
};
+check_member(mtk_spm_regs, pwr_status, 0x016c);
+check_member(mtk_spm_regs, audio_pwr_con, 0x0358);
check_member(mtk_spm_regs, ap_mdsrc_req, 0x043c);
check_member(mtk_spm_regs, ulposc_con, 0x644);
static struct mtk_spm_regs *const mtk_spm = (void *)SPM_BASE;
+static const struct power_domain_data disp[] = {
+ {
+ .pwr_con = &mtk_spm->vppsys0_pwr_con,
+ .pwr_sta_mask = 0x1 << 11,
+ .sram_pdn_mask = 0x1 << 8,
+ .sram_ack_mask = 0x1 << 12,
+ },
+ {
+ .pwr_con = &mtk_spm->vdosys0_pwr_con,
+ .pwr_sta_mask = 0x1 << 13,
+ .sram_pdn_mask = 0x1 << 8,
+ .sram_ack_mask = 0x1 << 12,
+ },
+ {
+ .pwr_con = &mtk_spm->vppsys1_pwr_con,
+ .pwr_sta_mask = 0x1 << 12,
+ .sram_pdn_mask = 0x1 << 8,
+ .sram_ack_mask = 0x1 << 12,
+ },
+ {
+ .pwr_con = &mtk_spm->vdosys1_pwr_con,
+ .pwr_sta_mask = 0x1 << 14,
+ .sram_pdn_mask = 0x1 << 8,
+ .sram_ack_mask = 0x1 << 12,
+ },
+};
+
+static const struct power_domain_data audio[] = {
+ {
+ .pwr_con = &mtk_spm->adsp_pwr_con,
+ .pwr_sta_mask = 0x1 << 10,
+ .sram_pdn_mask = 0x1 << 8,
+ .sram_ack_mask = 0x1 << 12,
+ .caps = SCPD_SRAM_ISO,
+ },
+ {
+ .pwr_con = &mtk_spm->audio_pwr_con,
+ .pwr_sta_mask = 0x1 << 8,
+ .sram_pdn_mask = 0x1 << 8,
+ .sram_ack_mask = 0x1 << 12,
+ },
+};
+
#endif /* SOC_MEDIATEK_MT8195_SPM_H */
diff --git a/src/soc/mediatek/mt8195/mtcmos.c b/src/soc/mediatek/mt8195/mtcmos.c
new file mode 100644
index 0000000..e194441
--- /dev/null
+++ b/src/soc/mediatek/mt8195/mtcmos.c
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <device/mmio.h>
+#include <soc/infracfg.h>
+#include <soc/mtcmos.h>
+
+enum {
+ VPPSYS0_PROT_STEP_6_MASK = 0x00100000,
+ VPPSYS0_PROT_STEP_5_MASK = 0x0007F8FF,
+ VPPSYS0_PROT_STEP_4_MASK = 0x00800000,
+ VPPSYS0_PROT_STEP_3_MASK = 0x01600300,
+ VPPSYS0_PROT_STEP_2_MASK = 0x80381DC7,
+ VPPSYS0_PROT_STEP_1_MASK = 0x00000400,
+
+ VDOSYS0_PROT_STEP_5_MASK = 0x00200000,
+ VDOSYS0_PROT_STEP_4_MASK = 0x3FC00000,
+ VDOSYS0_PROT_STEP_3_MASK = 0x00000040,
+ VDOSYS0_PROT_STEP_2_MASK = 0x00800000,
+ VDOSYS0_PROT_STEP_1_MASK = 0x403E6238,
+
+ VPPSYS1_PROT_STEP_3_MASK = 0x000400C0,
+ VPPSYS1_PROT_STEP_2_MASK = 0x00800000,
+ VPPSYS1_PROT_STEP_1_MASK = 0x000001E0,
+
+ VDOSYS1_PROT_STEP_3_MASK = 0x00000400,
+ VDOSYS1_PROT_STEP_2_MASK = 0x00400000,
+ VDOSYS1_PROT_STEP_1_MASK = 0xC0000000,
+
+ AUDIO_PROT_STEP_1_MASK = 0x00000600,
+};
+
+void mtcmos_protect_display_bus(void)
+{
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_sub_infra_vdnr_clr,
+ VPPSYS0_PROT_STEP_6_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr_2,
+ VPPSYS0_PROT_STEP_5_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_clr,
+ VPPSYS0_PROT_STEP_4_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr_2,
+ VPPSYS0_PROT_STEP_3_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr,
+ VPPSYS0_PROT_STEP_2_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_clr,
+ VPPSYS0_PROT_STEP_1_MASK);
+
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_sub_infra_vdnr_clr,
+ VDOSYS0_PROT_STEP_5_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr,
+ VDOSYS0_PROT_STEP_4_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_clr,
+ VDOSYS0_PROT_STEP_3_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr_2,
+ VDOSYS0_PROT_STEP_2_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr,
+ VDOSYS0_PROT_STEP_1_MASK);
+
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr_2,
+ VPPSYS1_PROT_STEP_3_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr,
+ VPPSYS1_PROT_STEP_2_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr,
+ VPPSYS1_PROT_STEP_1_MASK);
+
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr_2,
+ VDOSYS1_PROT_STEP_3_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr,
+ VDOSYS1_PROT_STEP_2_MASK);
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_mm_clr,
+ VDOSYS1_PROT_STEP_1_MASK);
+}
+
+void mtcmos_protect_audio_bus(void)
+{
+ write32(&mt8195_infracfg_ao->infra_topaxi_protecten_clr_2,
+ AUDIO_PROT_STEP_1_MASK);
+}
To view, visit change 52882. To unsubscribe, or for help writing mail filters, visit settings.