5 files changed, 71 insertions, 22 deletions

diff --git a/src/soc/mediatek/common/include/soc/mtcmos.h b/src/soc/mediatek/common/include/soc/mtcmos.h
index d8cb9f5153..0e0e32ac9a 100644
--- a/src/soc/mediatek/common/include/soc/mtcmos.h
+++ b/src/soc/mediatek/common/include/soc/mtcmos.h
@@ -3,6 +3,13 @@
 #ifndef __SOC_MEDIATEK_COMMON_MTCMOS_H__
 #define __SOC_MEDIATEK_COMMON_MTCMOS_H__
 
+struct power_domain_data {
+	void *pwr_con;
+	u32 pwr_sta_mask;
+	u32 sram_pdn_mask;
+	u32 sram_ack_mask;
+};
+
 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 cfd148c7fa..17a464fe5a 100644
--- a/src/soc/mediatek/common/mtcmos.c
+++ b/src/soc/mediatek/common/mtcmos.c
@@ -1,16 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <delay.h>
 #include <device/mmio.h>
-#include <soc/mtcmos.h>
 #include <soc/spm.h>
 
-struct power_domain_data {
-	void *pwr_con;
-	u32 pwr_sta_mask;
-	u32 sram_pdn_mask;
-	u32 sram_ack_mask;
-};
-
 enum {
 	SRAM_ISOINT_B	= 1U << 6,
 	SRAM_CKISO	= 1U << 5,
@@ -44,24 +37,16 @@ static void mtcmos_power_on(const struct power_domain_data *pd)
 
 void mtcmos_display_power_on(void)
 {
-	static const struct power_domain_data disp = {
-		.pwr_con = &mtk_spm->dis_pwr_con,
-		.pwr_sta_mask = DISP_PWR_STA_MASK,
-		.sram_pdn_mask = DISP_SRAM_PDN_MASK,
-		.sram_ack_mask = DISP_SRAM_ACK_MASK,
-	};
+	int i;
 
-	mtcmos_power_on(&disp);
+	for (i = 0; i < ARRAY_SIZE(disp); i++)
+		mtcmos_power_on(&disp[i]);
 }
 
 void mtcmos_audio_power_on(void)
 {
-	static const struct power_domain_data audio = {
-		.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,
-	};
+	int i;
 
-	mtcmos_power_on(&audio);
+	for (i = 0; i < ARRAY_SIZE(audio); i++)
+		mtcmos_power_on(&audio[i]);
 }
diff --git a/src/soc/mediatek/mt8173/include/soc/spm.h b/src/soc/mediatek/mt8173/include/soc/spm.h
index efc04d1ddc..64b33c8c83 100644
--- a/src/soc/mediatek/mt8173/include/soc/spm.h
+++ b/src/soc/mediatek/mt8173/include/soc/spm.h
@@ -4,6 +4,7 @@
 #define __SOC_MEDIATEK_MT8173_SPM_H__
 
 #include <soc/addressmap.h>
+#include <soc/mtcmos.h>
 #include <stddef.h>
 
 enum {
@@ -152,4 +153,22 @@ check_member(mtk_spm_regs, sleep_ca15_wfi_en[3], 0xf1c);
 
 static struct mtk_spm_regs *const mtk_spm = (void *)SPM_BASE;
 
+static const struct power_domain_data disp[] = {
+	{
+		.pwr_con = &mtk_spm->dis_pwr_con,
+		.pwr_sta_mask = DISP_PWR_STA_MASK,
+		.sram_pdn_mask = DISP_SRAM_PDN_MASK,
+		.sram_ack_mask = DISP_SRAM_ACK_MASK,
+	},
+};
+
+static const struct power_domain_data audio[] = {
+	{
+		.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,
+	},
+};
+
 #endif  /* __SOC_MEDIATEK_MT8173_SPM_H__ */
diff --git a/src/soc/mediatek/mt8183/include/soc/spm.h b/src/soc/mediatek/mt8183/include/soc/spm.h
index 327355ae05..d5663bef7a 100644
--- a/src/soc/mediatek/mt8183/include/soc/spm.h
+++ b/src/soc/mediatek/mt8183/include/soc/spm.h
@@ -4,6 +4,7 @@
 #define SOC_MEDIATEK_MT8183_SPM_H
 
 #include <soc/addressmap.h>
+#include <soc/mtcmos.h>
 #include <types.h>
 
 /* SPM READ/WRITE CFG */
@@ -580,4 +581,22 @@ struct dyna_load_pcm {
 
 int spm_init(void);
 
+static const struct power_domain_data disp[] = {
+	{
+		.pwr_con = &mtk_spm->dis_pwr_con,
+		.pwr_sta_mask = DISP_PWR_STA_MASK,
+		.sram_pdn_mask = DISP_SRAM_PDN_MASK,
+		.sram_ack_mask = DISP_SRAM_ACK_MASK,
+	},
+};
+
+static const struct power_domain_data audio[] = {
+	{
+		.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,
+	},
+};
+
 #endif  /* SOC_MEDIATEK_MT8183_SPM_H */
diff --git a/src/soc/mediatek/mt8192/include/soc/spm.h b/src/soc/mediatek/mt8192/include/soc/spm.h
index 8f69bf7efb..d99ca6587b 100644
--- a/src/soc/mediatek/mt8192/include/soc/spm.h
+++ b/src/soc/mediatek/mt8192/include/soc/spm.h
@@ -4,6 +4,7 @@
 #define SOC_MEDIATEK_MT8192_SPM_H
 
 #include <soc/addressmap.h>
+#include <soc/mtcmos.h>
 #include <stdint.h>
 #include <types.h>
 
@@ -674,4 +675,22 @@ struct dyna_load_pcm {
 
 int spm_init(void);
 
+static const struct power_domain_data disp[] = {
+	{
+		.pwr_con = &mtk_spm->dis_pwr_con,
+		.pwr_sta_mask = DISP_PWR_STA_MASK,
+		.sram_pdn_mask = DISP_SRAM_PDN_MASK,
+		.sram_ack_mask = DISP_SRAM_ACK_MASK,
+	},
+};
+
+static const struct power_domain_data audio[] = {
+	{
+		.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,
+	},
+};
+
 #endif  /* SOC_MEDIATEK_MT8192_SPM_H */