Yu-Ping Wu has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85211?usp=email )
Change subject: soc/mediatek: Rename dpm to dpm_v1 ......................................................................
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 --- M src/mainboard/google/asurada/mainboard.c M src/mainboard/google/cherry/mainboard.c M src/soc/mediatek/common/dpm_4ch.c R src/soc/mediatek/common/dpm_v1.c R src/soc/mediatek/common/include/soc/dpm_v1.h M src/soc/mediatek/mt8188/Makefile.mk M src/soc/mediatek/mt8188/soc.c M src/soc/mediatek/mt8192/Makefile.mk M src/soc/mediatek/mt8195/Makefile.mk 9 files changed, 11 insertions(+), 11 deletions(-)
Approvals: build bot (Jenkins): Verified Yu-Ping Wu: Looks good to me, approved Yidi Lin: Looks good to me, approved
diff --git a/src/mainboard/google/asurada/mainboard.c b/src/mainboard/google/asurada/mainboard.c index 2da9719..358717b 100644 --- a/src/mainboard/google/asurada/mainboard.c +++ b/src/mainboard/google/asurada/mainboard.c @@ -11,7 +11,7 @@ #include <gpio.h> #include <soc/bl31.h> #include <soc/ddp.h> -#include <soc/dpm.h> +#include <soc/dpm_v1.h> #include <soc/dsi.h> #include <soc/gpio_common.h> #include <soc/i2c.h> diff --git a/src/mainboard/google/cherry/mainboard.c b/src/mainboard/google/cherry/mainboard.c index 19638c9..16eabba 100644 --- a/src/mainboard/google/cherry/mainboard.c +++ b/src/mainboard/google/cherry/mainboard.c @@ -9,7 +9,7 @@ #include <gpio.h> #include <soc/bl31.h> #include <soc/display.h> -#include <soc/dpm.h> +#include <soc/dpm_v1.h> #include <soc/i2c.h> #include <soc/msdc.h> #include <soc/mtcmos.h> diff --git a/src/soc/mediatek/common/dpm_4ch.c b/src/soc/mediatek/common/dpm_4ch.c index f13337d..6b15411 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 similarity index 97% rename from src/soc/mediatek/common/dpm.c rename to src/soc/mediatek/common/dpm_v1.c index 0bcf409..4691b35 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 similarity index 91% rename from src/soc/mediatek/common/include/soc/dpm.h rename to src/soc/mediatek/common/include/soc/dpm_v1.h index e72b6a1..65623a2 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_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 8d1b783..e9e7088 100644 --- a/src/soc/mediatek/mt8188/Makefile.mk +++ b/src/soc/mediatek/mt8188/Makefile.mk @@ -40,7 +40,7 @@ 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 f2911ae..665f391e 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 0847439..8b409ba 100644 --- a/src/soc/mediatek/mt8192/Makefile.mk +++ b/src/soc/mediatek/mt8192/Makefile.mk @@ -38,7 +38,7 @@ 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 22f163b..3ece4ad 100644 --- a/src/soc/mediatek/mt8195/Makefile.mk +++ b/src/soc/mediatek/mt8195/Makefile.mk @@ -48,7 +48,7 @@ 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