From d5dafb2c0a6bac5c9d87f0e07e339570e0fd3267 Mon Sep 17 00:00:00 2001 From: Rex-BC Chen Date: Wed, 20 Jul 2022 10:22:53 +0800 Subject: [PATCH] mb/google: Replace some strings in regulator.c From comments of CB:65875, we replace *_vol to *_voltage. s/mainboard_set_regulator_vol/mainboard_set_regulator_voltage/ s/mainboard_get_regulator_vol/mainboard_get_regulator_voltage/ TEST=build pass BUG=b:233720142 Signed-off-by: Bo-Chen Chen Change-Id: Iadf0408e8914d6e32915464f93979978c4634eaf Reviewed-on: https://review.coreboot.org/c/coreboot/+/65994 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu --- src/mainboard/google/asurada/regulator.c | 5 ++--- src/mainboard/google/cherry/regulator.c | 5 ++--- src/mainboard/google/corsola/display.c | 4 ++-- src/mainboard/google/corsola/regulator.c | 5 ++--- src/mainboard/google/corsola/romstage.c | 4 ++-- .../mediatek/common/include/soc/regulator.h | 5 ++--- src/soc/mediatek/mt8186/msdc.c | 4 ++-- .../mediatek/mt8192/dramc/dramc_top.c | 20 +++++++++---------- .../mediatek/mt8195/dramc/dramc_top.c | 20 +++++++++---------- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/mainboard/google/asurada/regulator.c b/src/mainboard/google/asurada/regulator.c index d57df0126d..5fd5d4b8d7 100644 --- a/src/mainboard/google/asurada/regulator.c +++ b/src/mainboard/google/asurada/regulator.c @@ -38,8 +38,7 @@ static int get_mt6359p_regulator_id(enum mtk_regulator regulator) return -1; } -void mainboard_set_regulator_vol(enum mtk_regulator regulator, - uint32_t voltage_uv) +void mainboard_set_regulator_voltage(enum mtk_regulator regulator, uint32_t voltage_uv) { /* * Handle the regulator that does not have a regulator ID @@ -68,7 +67,7 @@ void mainboard_set_regulator_vol(enum mtk_regulator regulator, printk(BIOS_WARNING, "Invalid regulator ID: %d\n", regulator); } -uint32_t mainboard_get_regulator_vol(enum mtk_regulator regulator) +uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator) { /* * Handle the regulator that does not have a regulator ID diff --git a/src/mainboard/google/cherry/regulator.c b/src/mainboard/google/cherry/regulator.c index f157ae61dc..12de049e98 100644 --- a/src/mainboard/google/cherry/regulator.c +++ b/src/mainboard/google/cherry/regulator.c @@ -51,8 +51,7 @@ static int check_regulator_control(enum mtk_regulator regulator) return 0; } -void mainboard_set_regulator_vol(enum mtk_regulator regulator, - uint32_t voltage_uv) +void mainboard_set_regulator_voltage(enum mtk_regulator regulator, uint32_t voltage_uv) { if (check_regulator_control(regulator) < 0) return; @@ -89,7 +88,7 @@ void mainboard_set_regulator_vol(enum mtk_regulator regulator, printk(BIOS_ERR, "Invalid regulator ID: %d\n", regulator); } -uint32_t mainboard_get_regulator_vol(enum mtk_regulator regulator) +uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator) { if (check_regulator_control(regulator) < 0) return 0; diff --git a/src/mainboard/google/corsola/display.c b/src/mainboard/google/corsola/display.c index 5a88cad7b9..2f52175355 100644 --- a/src/mainboard/google/corsola/display.c +++ b/src/mainboard/google/corsola/display.c @@ -35,9 +35,9 @@ static void bridge_ps8640_power_on(void) */ /* Set VRF12 to 1.2V and VCN33 to 3.3V */ - mainboard_set_regulator_vol(MTK_REGULATOR_VRF12, 1200000); + mainboard_set_regulator_voltage(MTK_REGULATOR_VRF12, 1200000); udelay(100); - mainboard_set_regulator_vol(MTK_REGULATOR_VCN33, 3300000); + mainboard_set_regulator_voltage(MTK_REGULATOR_VCN33, 3300000); udelay(200); /* Turn on bridge */ diff --git a/src/mainboard/google/corsola/regulator.c b/src/mainboard/google/corsola/regulator.c index d607497a4f..4f03c181e2 100644 --- a/src/mainboard/google/corsola/regulator.c +++ b/src/mainboard/google/corsola/regulator.c @@ -26,8 +26,7 @@ static const int regulator_id[] = { _Static_assert(ARRAY_SIZE(regulator_id) == MTK_REGULATOR_NUM, "regulator_id size error"); -void mainboard_set_regulator_vol(enum mtk_regulator regulator, - uint32_t voltage_uv) +void mainboard_set_regulator_voltage(enum mtk_regulator regulator, uint32_t voltage_uv) { assert(regulator < MTK_REGULATOR_NUM); @@ -38,7 +37,7 @@ void mainboard_set_regulator_vol(enum mtk_regulator regulator, mt6366_set_voltage(regulator_id[regulator], voltage_uv); } -uint32_t mainboard_get_regulator_vol(enum mtk_regulator regulator) +uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator) { assert(regulator < MTK_REGULATOR_NUM); diff --git a/src/mainboard/google/corsola/romstage.c b/src/mainboard/google/corsola/romstage.c index 8d03b5b54c..01f8af3f0f 100644 --- a/src/mainboard/google/corsola/romstage.c +++ b/src/mainboard/google/corsola/romstage.c @@ -11,8 +11,8 @@ static void raise_little_cpu_freq(void) { - mainboard_set_regulator_vol(MTK_REGULATOR_VPROC12, 1031250); - mainboard_set_regulator_vol(MTK_REGULATOR_VSRAM_PROC12, 1118750); + mainboard_set_regulator_voltage(MTK_REGULATOR_VPROC12, 1031250); + mainboard_set_regulator_voltage(MTK_REGULATOR_VSRAM_PROC12, 1118750); udelay(200); mt_pll_raise_little_cpu_freq(2000 * MHz); mt_pll_raise_cci_freq(1385 * MHz); diff --git a/src/soc/mediatek/common/include/soc/regulator.h b/src/soc/mediatek/common/include/soc/regulator.h index 84bb364afd..0acf91059d 100644 --- a/src/soc/mediatek/common/include/soc/regulator.h +++ b/src/soc/mediatek/common/include/soc/regulator.h @@ -23,9 +23,8 @@ enum mtk_regulator { MTK_REGULATOR_NUM, }; -void mainboard_set_regulator_vol(enum mtk_regulator regulator, - uint32_t voltage_uv); -uint32_t mainboard_get_regulator_vol(enum mtk_regulator regulator); +void mainboard_set_regulator_voltage(enum mtk_regulator regulator, uint32_t voltage_uv); +uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator); int mainboard_enable_regulator(enum mtk_regulator regulator, uint8_t enable); uint8_t mainboard_regulator_is_enabled(enum mtk_regulator regulator); diff --git a/src/soc/mediatek/mt8186/msdc.c b/src/soc/mediatek/mt8186/msdc.c index cfdb0f2cfb..1a316db34d 100644 --- a/src/soc/mediatek/mt8186/msdc.c +++ b/src/soc/mediatek/mt8186/msdc.c @@ -102,6 +102,6 @@ void mtk_msdc_configure_sdcard(void) MSDC1_GPIO_MODE1_1, MSDC1_GPIO_MODE1_VALUE); /* enable SDCard power */ - mainboard_set_regulator_vol(MTK_REGULATOR_VMCH, 3300000); - mainboard_set_regulator_vol(MTK_REGULATOR_VMC, 3300000); + mainboard_set_regulator_voltage(MTK_REGULATOR_VMCH, 3300000); + mainboard_set_regulator_voltage(MTK_REGULATOR_VMC, 3300000); } diff --git a/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c b/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c index 04fd62a27f..aa4f2ef297 100644 --- a/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c +++ b/src/vendorcode/mediatek/mt8192/dramc/dramc_top.c @@ -176,7 +176,7 @@ unsigned int dramc_set_vcore_voltage(unsigned int vcore) dramc_debug("%s set vcore to %d\n", __func__, vcore); //mt6359p_buck_set_voltage(MT6359P_GPU11, vcore); - mainboard_set_regulator_vol(MTK_REGULATOR_VCORE, vcore); + mainboard_set_regulator_voltage(MTK_REGULATOR_VCORE, vcore); return 0; } @@ -186,7 +186,7 @@ unsigned int dramc_get_vcore_voltage(void) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vcore); #else - return mainboard_get_regulator_vol(MTK_REGULATOR_VCORE); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VCORE); #endif } @@ -195,7 +195,7 @@ unsigned int dramc_set_vdram_voltage(unsigned int ddr_type, unsigned int vdram) #ifdef MTK_PMIC_MT6359 mtk_regulator_set_voltage(®_vdram, vdram, MAX_VDRAM); #endif - mainboard_set_regulator_vol(MTK_REGULATOR_VDD2, vdram); + mainboard_set_regulator_voltage(MTK_REGULATOR_VDD2, vdram); return 0; } @@ -204,7 +204,7 @@ unsigned int dramc_get_vdram_voltage(unsigned int ddr_type) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vdram); #else - return mainboard_get_regulator_vol(MTK_REGULATOR_VDD2); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VDD2); #endif } @@ -213,7 +213,7 @@ unsigned int dramc_set_vddq_voltage(unsigned int ddr_type, unsigned int vddq) #ifdef MTK_PMIC_MT6359 mtk_regulator_set_voltage(®_vddq, vddq, MAX_VDDQ); #endif - mainboard_set_regulator_vol(MTK_REGULATOR_VDDQ, vddq); + mainboard_set_regulator_voltage(MTK_REGULATOR_VDDQ, vddq); return 0; } @@ -222,7 +222,7 @@ unsigned int dramc_get_vddq_voltage(unsigned int ddr_type) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vddq); #else - return mainboard_get_regulator_vol(MTK_REGULATOR_VDDQ); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VDDQ); #endif } @@ -231,7 +231,7 @@ unsigned int dramc_set_vmddr_voltage(unsigned int vmddr) #ifdef MTK_PMIC_MT6359 return mtk_regulator_set_voltage(®_vmddr, vmddr, MAX_VMDDR); #endif - mainboard_set_regulator_vol(MTK_REGULATOR_VMDDR, vmddr); + mainboard_set_regulator_voltage(MTK_REGULATOR_VMDDR, vmddr); return 0; } @@ -240,7 +240,7 @@ unsigned int dramc_get_vmddr_voltage(void) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vmddr); #else - return mainboard_get_regulator_vol(MTK_REGULATOR_VMDDR); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VMDDR); #endif } @@ -252,7 +252,7 @@ unsigned int dramc_set_vio18_voltage(unsigned int vio18) pmic_config_interface(PMIC_RG_VM18_VOCAL_ADDR, twist, PMIC_RG_VM18_VOCAL_MASK, PMIC_RG_VM18_VOCAL_SHIFT); return mtk_regulator_set_voltage(®_vio18, vio18, MAX_VIO18); #else - mainboard_set_regulator_vol(MTK_REGULATOR_VDD1, vio18); + mainboard_set_regulator_voltage(MTK_REGULATOR_VDD1, vio18); return 0; #endif } @@ -265,7 +265,7 @@ unsigned int dramc_get_vio18_voltage(void) pmic_read_interface(PMIC_RG_VM18_VOCAL_ADDR, &twist, PMIC_RG_VM18_VOCAL_MASK, PMIC_RG_VM18_VOCAL_SHIFT); return mtk_regulator_get_voltage(®_vio18) + twist * UNIT_VIO18; #else - return mainboard_get_regulator_vol(MTK_REGULATOR_VDD1); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VDD1); #endif } diff --git a/src/vendorcode/mediatek/mt8195/dramc/dramc_top.c b/src/vendorcode/mediatek/mt8195/dramc/dramc_top.c index e5e3b19b09..e6b93335a1 100644 --- a/src/vendorcode/mediatek/mt8195/dramc/dramc_top.c +++ b/src/vendorcode/mediatek/mt8195/dramc/dramc_top.c @@ -354,7 +354,7 @@ unsigned int dramc_set_vcore_voltage(unsigned int vcore) return mtk_regulator_set_voltage(®_vcore, vcore, MAX_VCORE); #elif defined(FOR_COREBOOT) dramc_debug("%s set vcore to %u\n", __func__, vcore); - mainboard_set_regulator_vol(MTK_REGULATOR_VCORE, vcore); + mainboard_set_regulator_voltage(MTK_REGULATOR_VCORE, vcore); return 0; #else return 0; @@ -366,7 +366,7 @@ unsigned int dramc_get_vcore_voltage(void) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vcore); #elif defined(FOR_COREBOOT) - return mainboard_get_regulator_vol(MTK_REGULATOR_VCORE); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VCORE); #else return 0; #endif @@ -377,7 +377,7 @@ unsigned int dramc_set_vmdd_voltage(unsigned int ddr_type, unsigned int vdram) #ifdef MTK_PMIC_MT6359 mtk_regulator_set_voltage(®_vdram, vdram, MAX_VDRAM); #elif defined(FOR_COREBOOT) - mainboard_set_regulator_vol(MTK_REGULATOR_VDD2, vdram); + mainboard_set_regulator_voltage(MTK_REGULATOR_VDD2, vdram); #endif return 0; } @@ -387,7 +387,7 @@ unsigned int dramc_get_vmdd_voltage(unsigned int ddr_type) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vdram); #elif defined(FOR_COREBOOT) - return mainboard_get_regulator_vol(MTK_REGULATOR_VDD2); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VDD2); #else return 0; #endif @@ -398,7 +398,7 @@ unsigned int dramc_set_vmddq_voltage(unsigned int ddr_type, unsigned int vddq) #ifdef MTK_PMIC_MT6359 mtk_regulator_set_voltage(®_vddq, vddq, MAX_VDDQ); #elif defined(FOR_COREBOOT) - mainboard_set_regulator_vol(MTK_REGULATOR_VDDQ, vddq); + mainboard_set_regulator_voltage(MTK_REGULATOR_VDDQ, vddq); #endif return 0; } @@ -408,7 +408,7 @@ unsigned int dramc_get_vmddq_voltage(unsigned int ddr_type) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vddq); #elif defined(FOR_COREBOOT) - return mainboard_get_regulator_vol(MTK_REGULATOR_VDDQ); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VDDQ); #else return 0; #endif @@ -419,7 +419,7 @@ unsigned int dramc_set_vmddr_voltage(unsigned int vmddr) #ifdef MTK_PMIC_MT6359 return mtk_regulator_set_voltage(®_vmddr, vmddr, MAX_VMDDR); #elif defined(FOR_COREBOOT) - mainboard_set_regulator_vol(MTK_REGULATOR_VMDDR, vmddr); + mainboard_set_regulator_voltage(MTK_REGULATOR_VMDDR, vmddr); return 0; #else return 0; @@ -431,7 +431,7 @@ unsigned int dramc_get_vmddr_voltage(void) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vmddr); #elif defined(FOR_COREBOOT) - return mainboard_get_regulator_vol(MTK_REGULATOR_VMDDR); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VMDDR); #else return 0; #endif @@ -442,7 +442,7 @@ unsigned int dramc_set_vio18_voltage(unsigned int vio18) #ifdef MTK_PMIC_MT6359 return mtk_regulator_set_voltage(®_vio18, vio18, MAX_VIO18); #elif defined(FOR_COREBOOT) - mainboard_set_regulator_vol(MTK_REGULATOR_VDD1, vio18); + mainboard_set_regulator_voltage(MTK_REGULATOR_VDD1, vio18); return 0; #else return 0; @@ -455,7 +455,7 @@ unsigned int dramc_get_vio18_voltage(void) #ifdef MTK_PMIC_MT6359 return mtk_regulator_get_voltage(®_vio18); #elif defined(FOR_COREBOOT) - return mainboard_get_regulator_vol(MTK_REGULATOR_VDD1); + return mainboard_get_regulator_voltage(MTK_REGULATOR_VDD1); #else return 0; #endif