soc/mediatek: Move the MT8192 MCUPM driver to common
The MPUCM drivers can be shared by MT8192 and MT8195.
TEST=emerge-asurada coreboot;
Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
Change-Id: I07a66bcf5a149582f34df1cfd08b5514fc5c2eb9
Reviewed-on: https://review.coreboot.org/c/coreboot/+/54898
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
diff --git a/src/soc/mediatek/common/include/soc/mcupm.h b/src/soc/mediatek/common/include/soc/mcupm.h
new file mode 100644
index 0000000..c9642af
--- /dev/null
+++ b/src/soc/mediatek/common/include/soc/mcupm.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef SOC_MEDIATEK_COMMON_MCUPM_H
+#define SOC_MEDIATEK_COMMON_MCUPM_H
+
+#include <soc/addressmap.h>
+#include <types.h>
+
+struct mcupm_regs {
+ u32 sw_rstn;
+};
+static struct mcupm_regs *const mcupm_reg = (void *)MCUPM_CFG_BASE;
+void mcupm_init(void);
+#endif /* SOC_MEDIATEK_COMMON_MCUPM_H */
diff --git a/src/soc/mediatek/mt8192/mcupm.c b/src/soc/mediatek/common/mcupm.c
similarity index 89%
rename from src/soc/mediatek/mt8192/mcupm.c
rename to src/soc/mediatek/common/mcupm.c
index 70981a0..dde10e2 100644
--- a/src/soc/mediatek/mt8192/mcupm.c
+++ b/src/soc/mediatek/common/mcupm.c
@@ -12,7 +12,7 @@
{
/* Clear abnormal boot register */
write32((void *)ABNORMALBOOT_REG, 0x0);
- write32(&mt8192_mcupm->sw_rstn, 0x1);
+ write32(&mcupm_reg->sw_rstn, 0x1);
}
static struct mtk_mcu mcupm = {
@@ -26,7 +26,7 @@
mcupm.load_buffer = _dram_dma;
mcupm.buffer_size = REGION_SIZE(dram_dma);
- write32(&mt8192_mcupm->sw_rstn, 0x0);
+ write32(&mcupm_reg->sw_rstn, 0x0);
if (mtk_init_mcu(&mcupm))
die("%s() failed\n", __func__);
diff --git a/src/soc/mediatek/mt8192/Makefile.inc b/src/soc/mediatek/mt8192/Makefile.inc
index f69274e..bdff835 100644
--- a/src/soc/mediatek/mt8192/Makefile.inc
+++ b/src/soc/mediatek/mt8192/Makefile.inc
@@ -53,7 +53,7 @@
ramstage-y += ../common/i2c.c i2c.c
ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
ramstage-y += ../common/mcu.c
-ramstage-y += mcupm.c
+ramstage-y += ../common/mcupm.c
ramstage-y += ../common/mmu_operations.c mmu_operations.c
ramstage-$(CONFIG_COMMONLIB_STORAGE_MMC) += ../common/msdc.c
ramstage-y += ../common/mtcmos.c mtcmos.c
diff --git a/src/soc/mediatek/mt8192/include/soc/mcupm.h b/src/soc/mediatek/mt8192/include/soc/mcupm.h
deleted file mode 100644
index dcb8c4a..0000000
--- a/src/soc/mediatek/mt8192/include/soc/mcupm.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef SOC_MEDIATEK_MT8192_MCUPM_H
-#define SOC_MEDIATEK_MT8192_MCUPM_H
-
-#include <soc/addressmap.h>
-#include <types.h>
-
-struct mt8192_mcupm_regs {
- u32 sw_rstn;
-};
-static struct mt8192_mcupm_regs *const mt8192_mcupm = (void *)MCUPM_CFG_BASE;
-void mcupm_init(void);
-#endif /* SOC_MEDIATEK_MT8192_MCUPM_H */