diff options
| -rw-r--r-- | src/soc/mediatek/common/include/soc/mcupm.h | 14 | ||||
| -rw-r--r-- | src/soc/mediatek/common/mcupm.c (renamed from src/soc/mediatek/mt8192/mcupm.c) | 4 | ||||
| -rw-r--r-- | src/soc/mediatek/mt8192/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/mediatek/mt8192/include/soc/mcupm.h | 14 |
4 files changed, 17 insertions, 17 deletions
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 0000000000..c9642afefe --- /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 index 70981a05ec..dde10e21ca 100644 --- a/src/soc/mediatek/mt8192/mcupm.c +++ b/src/soc/mediatek/common/mcupm.c @@ -12,7 +12,7 @@ static void reset_mcupm(struct mtk_mcu *mcu) { /* 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 @@ void mcupm_init(void) 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 f69274e3fe..bdff835c0e 100644 --- a/src/soc/mediatek/mt8192/Makefile.inc +++ b/src/soc/mediatek/mt8192/Makefile.inc @@ -53,7 +53,7 @@ ramstage-y += ../common/gpio.c gpio.c 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 dcb8c4a3e0..0000000000 --- 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 */ |