summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorCrystal Guo <crystal.guo@mediatek.corp-partner.google.com>2024-11-20 10:40:57 +0800
committerYu-Ping Wu <yupingso@google.com>2024-11-21 13:46:47 +0000
commitfeddd37297d2157504540aa861e86e7e2aeba782 (patch)
tree219b6baa9521f361cf055d19112a7d3c99562ad8 /src/soc
parent992e09a1d5e0501711ee76083d9d00828fcbddd7 (diff)
soc/mediatek: Rename dpm to dpm_v1
MT8196 equips new DPM hardware which is different from precedent SoCs. Therefore, we need implement a new DPM loader (said version 2) to run the blob. Considering the version iteration, rename the original dpm to dpm_v1. TEST=Build pass. BUG=b:317009620 Change-Id: I07afb8f5c23e96aad3c6cb0887cb7efd16ebf296 Signed-off-by: Crystal Guo <crystal.guo@mediatek.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85211 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Yu-Ping Wu <yupingso@google.com> Reviewed-by: Yidi Lin <yidilin@google.com>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/mediatek/common/dpm_4ch.c2
-rw-r--r--src/soc/mediatek/common/dpm_v1.c (renamed from src/soc/mediatek/common/dpm.c)2
-rw-r--r--src/soc/mediatek/common/include/soc/dpm_v1.h (renamed from src/soc/mediatek/common/include/soc/dpm.h)6
-rw-r--r--src/soc/mediatek/mt8188/Makefile.mk2
-rw-r--r--src/soc/mediatek/mt8188/soc.c2
-rw-r--r--src/soc/mediatek/mt8192/Makefile.mk2
-rw-r--r--src/soc/mediatek/mt8195/Makefile.mk2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/soc/mediatek/common/dpm_4ch.c b/src/soc/mediatek/common/dpm_4ch.c
index f13337d8b7..6b15411300 100644
--- a/src/soc/mediatek/common/dpm_4ch.c
+++ b/src/soc/mediatek/common/dpm_4ch.c
@@ -3,7 +3,7 @@
#include <console/console.h>
#include <delay.h>
#include <device/mmio.h>
-#include <soc/dpm.h>
+#include <soc/dpm_v1.h>
#include <soc/dramc_soc.h>
#include <soc/spm.h>
#include <soc/symbols.h>
diff --git a/src/soc/mediatek/common/dpm.c b/src/soc/mediatek/common/dpm_v1.c
index 0bcf409399..4691b35569 100644
--- a/src/soc/mediatek/common/dpm.c
+++ b/src/soc/mediatek/common/dpm_v1.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <device/mmio.h>
-#include <soc/dpm.h>
+#include <soc/dpm_v1.h>
#include <soc/mcu_common.h>
#include <soc/symbols.h>
diff --git a/src/soc/mediatek/common/include/soc/dpm.h b/src/soc/mediatek/common/include/soc/dpm_v1.h
index e72b6a1f3d..65623a2671 100644
--- a/src/soc/mediatek/common/include/soc/dpm.h
+++ b/src/soc/mediatek/common/include/soc/dpm_v1.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __SOC_MEDIATEK_COMMON_DPM_H__
-#define __SOC_MEDIATEK_COMMON_DPM_H__
+#ifndef __SOC_MEDIATEK_COMMON_DPM_V1_H__
+#define __SOC_MEDIATEK_COMMON_DPM_V1_H__
#include <soc/addressmap.h>
#include <soc/mcu_common.h>
@@ -53,4 +53,4 @@ int dpm_init(void);
int dpm_4ch_para_setting(void);
int dpm_4ch_init(void);
-#endif /* __SOC_MEDIATEK_COMMON_DPM_H__ */
+#endif /* __SOC_MEDIATEK_COMMON_DPM_V1_H__ */
diff --git a/src/soc/mediatek/mt8188/Makefile.mk b/src/soc/mediatek/mt8188/Makefile.mk
index 8d1b783784..e9e70880bd 100644
--- a/src/soc/mediatek/mt8188/Makefile.mk
+++ b/src/soc/mediatek/mt8188/Makefile.mk
@@ -40,7 +40,7 @@ ramstage-y += ../common/devapc.c devapc.c
ramstage-y += ../common/dfd.c
ramstage-y += ../common/display.c
ramstage-y += ../common/dp/dp_intf.c ../common/dp/dptx.c ../common/dp/dptx_hal.c dp_intf.c
-ramstage-y += ../common/dpm.c
+ramstage-y += ../common/dpm_v1.c
ramstage-$(CONFIG_DPM_FOUR_CHANNEL) += ../common/dpm_4ch.c
ramstage-y += ../common/dsi.c ../common/mtk_mipi_dphy.c
ramstage-y += ../common/emi.c
diff --git a/src/soc/mediatek/mt8188/soc.c b/src/soc/mediatek/mt8188/soc.c
index f2911aec10..665f391ec6 100644
--- a/src/soc/mediatek/mt8188/soc.c
+++ b/src/soc/mediatek/mt8188/soc.c
@@ -6,7 +6,7 @@
#include <soc/cpu_input_gating.h>
#include <soc/devapc.h>
#include <soc/dfd.h>
-#include <soc/dpm.h>
+#include <soc/dpm_v1.h>
#include <soc/emi.h>
#include <soc/mcupm.h>
#include <soc/mmu_operations.h>
diff --git a/src/soc/mediatek/mt8192/Makefile.mk b/src/soc/mediatek/mt8192/Makefile.mk
index 0847439df3..8b409baa10 100644
--- a/src/soc/mediatek/mt8192/Makefile.mk
+++ b/src/soc/mediatek/mt8192/Makefile.mk
@@ -38,7 +38,7 @@ ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += ../common/bl31.c
ramstage-y += ../common/ddp.c ddp.c
ramstage-y += devapc.c
ramstage-y += ../common/dfd.c
-ramstage-y += ../common/dpm.c
+ramstage-y += ../common/dpm_v1.c
ramstage-y += ../common/dsi.c ../common/mtk_mipi_dphy.c
ramstage-y += ../common/l2c_ops.c
ramstage-y += ../common/mcu.c
diff --git a/src/soc/mediatek/mt8195/Makefile.mk b/src/soc/mediatek/mt8195/Makefile.mk
index 22f163b2d4..3ece4adf1f 100644
--- a/src/soc/mediatek/mt8195/Makefile.mk
+++ b/src/soc/mediatek/mt8195/Makefile.mk
@@ -48,7 +48,7 @@ ramstage-y += ../common/ddp.c ddp.c
ramstage-y += ../common/devapc.c devapc.c
ramstage-y += ../common/dfd.c
ramstage-y += ../common/display.c
-ramstage-y += ../common/dpm.c
+ramstage-y += ../common/dpm_v1.c
ramstage-$(CONFIG_DPM_FOUR_CHANNEL) += ../common/dpm_4ch.c
ramstage-y += ../common/dp/dp_intf.c ../common/dp/dptx.c ../common/dp/dptx_hal.c dp_intf.c
ramstage-y += emi.c