Yidi Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85764?usp=email )
Change subject: soc/mediatek: Distinguish pmic_init_setting function name ......................................................................
soc/mediatek: Distinguish pmic_init_setting function name
Rename pmic_init_setting to ${PMIC model}_init_setting accordingly.
Change-Id: Id591bf3089aaa2148d34c77d021c17403494a776 Signed-off-by: Yidi Lin yidilin@chromium.org Reviewed-on: https://review.coreboot.org/c/coreboot/+/85764 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Yu-Ping Wu yupingso@google.com --- M src/soc/mediatek/common/include/soc/mt6359p.h M src/soc/mediatek/common/include/soc/mt6363.h M src/soc/mediatek/common/mt6359p.c M src/soc/mediatek/common/mt6363.c M src/soc/mediatek/mt8188/mt6359p.c M src/soc/mediatek/mt8192/mt6359p.c M src/soc/mediatek/mt8195/mt6359p.c M src/soc/mediatek/mt8196/mt6363.c 8 files changed, 13 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Yu-Ping Wu: Looks good to me, approved
diff --git a/src/soc/mediatek/common/include/soc/mt6359p.h b/src/soc/mediatek/common/include/soc/mt6359p.h index 55a1a4d..fa21eaa 100644 --- a/src/soc/mediatek/common/include/soc/mt6359p.h +++ b/src/soc/mediatek/common/include/soc/mt6359p.h @@ -89,6 +89,6 @@ void mt6359p_enable_vm18(bool enable); void mt6359p_init_pmif_arb(void); void mt6359p_write_field(u32 reg, u32 val, u32 mask, u32 shift); -void pmic_init_setting(void); -void pmic_lp_setting(void); +void mt6359p_init_setting(void); +void mt6359p_lp_setting(void); #endif /* __SOC_MEDIATEK_MT6359P_H__ */ diff --git a/src/soc/mediatek/common/include/soc/mt6363.h b/src/soc/mediatek/common/include/soc/mt6363.h index 7e4487f..19b23d4 100644 --- a/src/soc/mediatek/common/include/soc/mt6363.h +++ b/src/soc/mediatek/common/include/soc/mt6363.h @@ -111,6 +111,6 @@ u32 mt6363_read16(u32 reg); void mt6363_write8(u32 reg, u8 reg_val); void mt6363_write_field(u32 reg, u32 val, u32 mask, u32 shift); -void pmic_init_setting(void); +void mt6363_init_setting(void);
#endif /* __SOC_MEDIATEK_MT6363_H__ */ diff --git a/src/soc/mediatek/common/mt6359p.c b/src/soc/mediatek/common/mt6359p.c index 47c46d0..e766479 100644 --- a/src/soc/mediatek/common/mt6359p.c +++ b/src/soc/mediatek/common/mt6359p.c @@ -347,8 +347,8 @@ pmic_set_power_hold(); pmic_wdt_set(); pmic_protect_key_setting(false); - pmic_init_setting(); - pmic_lp_setting(); + mt6359p_init_setting(); + mt6359p_lp_setting(); pmic_efuse_setting(); pmic_protect_key_setting(true); pmic_wk_vs2_voter_setting(); diff --git a/src/soc/mediatek/common/mt6363.c b/src/soc/mediatek/common/mt6363.c index 9619d44..691282b 100644 --- a/src/soc/mediatek/common/mt6363.c +++ b/src/soc/mediatek/common/mt6363.c @@ -269,6 +269,6 @@ pmic_set_power_hold(); pmic_wdt_set(); pmic_protect_key_setting(false); - pmic_init_setting(); + mt6363_init_setting(); pmic_protect_key_setting(true); } diff --git a/src/soc/mediatek/mt8188/mt6359p.c b/src/soc/mediatek/mt8188/mt6359p.c index db3029e..9c8a2b5 100644 --- a/src/soc/mediatek/mt8188/mt6359p.c +++ b/src/soc/mediatek/mt8188/mt6359p.c @@ -209,14 +209,14 @@ {0x1d14, 0x1, 0x1, 0x2}, };
-void pmic_init_setting(void) +void mt6359p_init_setting(void) { for (int i = 0; i < ARRAY_SIZE(init_setting); i++) mt6359p_write_field(init_setting[i].addr, init_setting[i].val, init_setting[i].mask, init_setting[i].shift); }
-void pmic_lp_setting(void) +void mt6359p_lp_setting(void) { for (int i = 0; i < ARRAY_SIZE(lp_setting); i++) mt6359p_write_field(lp_setting[i].addr, lp_setting[i].val, diff --git a/src/soc/mediatek/mt8192/mt6359p.c b/src/soc/mediatek/mt8192/mt6359p.c index 7579e2d..a5576db 100644 --- a/src/soc/mediatek/mt8192/mt6359p.c +++ b/src/soc/mediatek/mt8192/mt6359p.c @@ -283,14 +283,14 @@ {0x1d14, 0x1, 0x1, 0x2}, };
-void pmic_init_setting(void) +void mt6359p_init_setting(void) { for (int i = 0; i < ARRAY_SIZE(init_setting); i++) mt6359p_write_field(init_setting[i].addr, init_setting[i].val, init_setting[i].mask, init_setting[i].shift); }
-void pmic_lp_setting(void) +void mt6359p_lp_setting(void) { for (int i = 0; i < ARRAY_SIZE(lp_setting); i++) mt6359p_write_field(lp_setting[i].addr, lp_setting[i].val, diff --git a/src/soc/mediatek/mt8195/mt6359p.c b/src/soc/mediatek/mt8195/mt6359p.c index 8a88d8c..690596b 100644 --- a/src/soc/mediatek/mt8195/mt6359p.c +++ b/src/soc/mediatek/mt8195/mt6359p.c @@ -239,14 +239,14 @@ {0x1d14, 0x1, 0x1, 0x2}, };
-void pmic_init_setting(void) +void mt6359p_init_setting(void) { for (int i = 0; i < ARRAY_SIZE(init_setting); i++) mt6359p_write_field(init_setting[i].addr, init_setting[i].val, init_setting[i].mask, init_setting[i].shift); }
-void pmic_lp_setting(void) +void mt6359p_lp_setting(void) { for (int i = 0; i < ARRAY_SIZE(lp_setting); i++) mt6359p_write_field(lp_setting[i].addr, lp_setting[i].val, diff --git a/src/soc/mediatek/mt8196/mt6363.c b/src/soc/mediatek/mt8196/mt6363.c index e41ce0e..cc5ae56 100644 --- a/src/soc/mediatek/mt8196/mt6363.c +++ b/src/soc/mediatek/mt8196/mt6363.c @@ -376,7 +376,7 @@ {0x191A, 0x8, 0xFF}, };
-void pmic_init_setting(void) +void mt6363_init_setting(void) { for (int i = 0; i < ARRAY_SIZE(init_setting); i++) mt6363_write_field(init_setting[i].addr, init_setting[i].val,