[coreboot-gerrit] Change in coreboot[master]: soc/mediatek/mt8195: Update audio and adsp power control

[Rex-BC Chen (Code Review)]

Rex-BC Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63106 )

Change subject: soc/mediatek/mt8195: Update audio and adsp power control
......................................................................

soc/mediatek/mt8195: Update audio and adsp power control

Enable adsp power before audio power and update bus protection step

TEST=build pass
BUG=b:204391159
BRANCH=cherry

Signed-off-by: Chun-Jie Chen 
Change-Id: I0bcf1ddeebf0d3df0a1d6b22273123be1aaf85a8
---
M src/soc/mediatek/mt8195/include/soc/spm.h
M src/soc/mediatek/mt8195/mtcmos.c
2 files changed, 16 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/63106/1

diff --git a/src/soc/mediatek/mt8195/include/soc/spm.h b/src/soc/mediatek/mt8195/include/soc/spm.h
index 945852a..25f6d6b 100644
--- a/src/soc/mediatek/mt8195/include/soc/spm.h
+++ b/src/soc/mediatek/mt8195/include/soc/spm.h
@@ -946,6 +946,7 @@

check_member(mtk_spm_regs, pwr_status, 0x016c);
 check_member(mtk_spm_regs, audio_pwr_con, 0x0358);
+check_member(mtk_spm_regs, adsp_pwr_con, 0x0360);
 check_member(mtk_spm_regs, ap_mdsrc_req, 0x043c);
 check_member(mtk_spm_regs, ulposc_con, 0x644);

@@ -1000,10 +1001,16 @@

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,
+	},
+	{
    	.pwr_con = &mtk_spm->audio_pwr_con,
-		.pwr_sta_mask = AUDIO_PWR_STA_MASK,
-		.sram_pdn_mask = AUDIO_SRAM_PDN_MASK,
-		.sram_ack_mask = AUDIO_SRAM_ACK_MASK,
+		.pwr_sta_mask = 0x1 << 8,
+		.sram_pdn_mask = 0x1 << 8,
+		.sram_ack_mask = 0x1 << 12,
    },
 };

diff --git a/src/soc/mediatek/mt8195/mtcmos.c b/src/soc/mediatek/mt8195/mtcmos.c
index e194441..cc2edb8 100644
--- a/src/soc/mediatek/mt8195/mtcmos.c
+++ b/src/soc/mediatek/mt8195/mtcmos.c
@@ -26,7 +26,9 @@
    VDOSYS1_PROT_STEP_2_MASK	= 0x00400000,
    VDOSYS1_PROT_STEP_1_MASK	= 0xC0000000,

-	AUDIO_PROT_STEP_1_MASK		= 0x00000600,
+	ADSP_PROT_STEP_1_MASK		= 0x0001D000,
+
+	AUDIO_PROT_STEP_1_MASK		= 0x00000A00,
 };

void mtcmos_protect_display_bus(void)
@@ -73,5 +75,8 @@
 void mtcmos_protect_audio_bus(void)
 {
    write32(&mt8195_infracfg_ao->infra_topaxi_protecten_clr_2,
+		ADSP_PROT_STEP_1_MASK);
+
+	write32(&mt8195_infracfg_ao->infra_topaxi_protecten_clr_2,
    	AUDIO_PROT_STEP_1_MASK);
 }