mb/google: Use boolean type for "enable" argument for regulator

Because 0 and 1 are the only possible values,
1. Change input argument "enable" of mainboard_enable_regulator to bool.
2. Change return value of mainboard_regulator_is_enabled() to bool.

TEST=build pass
BUG=b:233720142

Signed-off-by: Bo-Chen Chen <rex-bc.chen@mediatek.com>
Change-Id: Iae09c5fedf8f7394bfbb677e5aee37ed061304fd
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65997
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Rex-BC Chen
2022-07-20 11:35:57 +08:00
committed by Felix Held
parent d5dafb2c0a
commit c5d4d964f1
5 changed files with 17 additions and 18 deletions

View File

@@ -94,7 +94,7 @@ uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator)
return 0; return 0;
} }
int mainboard_enable_regulator(enum mtk_regulator regulator, uint8_t enable) int mainboard_enable_regulator(enum mtk_regulator regulator, bool enable)
{ {
/* Return 0 if the regulator is already enabled or disabled. */ /* Return 0 if the regulator is already enabled or disabled. */
if (mainboard_regulator_is_enabled(regulator) == enable) if (mainboard_regulator_is_enabled(regulator) == enable)
@@ -111,7 +111,7 @@ int mainboard_enable_regulator(enum mtk_regulator regulator, uint8_t enable)
return google_chromeec_regulator_enable(id, enable); return google_chromeec_regulator_enable(id, enable);
} }
uint8_t mainboard_regulator_is_enabled(enum mtk_regulator regulator) bool mainboard_regulator_is_enabled(enum mtk_regulator regulator)
{ {
int id; int id;
@@ -119,7 +119,7 @@ uint8_t mainboard_regulator_is_enabled(enum mtk_regulator regulator)
if (id < 0) { if (id < 0) {
printk(BIOS_WARNING, "Invalid regulator ID: %d\n; assuming disabled", printk(BIOS_WARNING, "Invalid regulator ID: %d\n; assuming disabled",
regulator); regulator);
return 0; return false;
} }
uint8_t enabled; uint8_t enabled;
@@ -127,8 +127,8 @@ uint8_t mainboard_regulator_is_enabled(enum mtk_regulator regulator)
printk(BIOS_WARNING, printk(BIOS_WARNING,
"Failed to query regulator ID: %d\n; assuming disabled", "Failed to query regulator ID: %d\n; assuming disabled",
regulator); regulator);
return 0; return false;
} }
return enabled; return !!enabled;
} }

View File

@@ -123,7 +123,7 @@ uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator)
return 0; return 0;
} }
int mainboard_enable_regulator(enum mtk_regulator regulator, uint8_t enable) int mainboard_enable_regulator(enum mtk_regulator regulator, bool enable)
{ {
if (check_regulator_control(regulator) < 0) if (check_regulator_control(regulator) < 0)
return 0; return 0;
@@ -154,17 +154,17 @@ int mainboard_enable_regulator(enum mtk_regulator regulator, uint8_t enable)
return -1; return -1;
} }
uint8_t mainboard_regulator_is_enabled(enum mtk_regulator regulator) bool mainboard_regulator_is_enabled(enum mtk_regulator regulator)
{ {
if (check_regulator_control(regulator) < 0) if (check_regulator_control(regulator) < 0)
return 0; return false;
int id; int id;
id = get_mt6360_regulator_id(regulator); id = get_mt6360_regulator_id(regulator);
if (id >= 0) { if (id >= 0) {
if (CONFIG(BOARD_GOOGLE_CHERRY)) { if (CONFIG(BOARD_GOOGLE_CHERRY)) {
return mt6360_is_enabled(id); return !!mt6360_is_enabled(id);
} else { } else {
uint8_t enabled; uint8_t enabled;
if (google_chromeec_regulator_is_enabled(id, &enabled) < 0) { if (google_chromeec_regulator_is_enabled(id, &enabled) < 0) {
@@ -172,12 +172,12 @@ uint8_t mainboard_regulator_is_enabled(enum mtk_regulator regulator)
"Failed to retrieve is_enabled by ec; assuming disabled\n"); "Failed to retrieve is_enabled by ec; assuming disabled\n");
return 0; return 0;
} }
return enabled; return !!enabled;
} }
} }
printk(BIOS_ERR, "Invalid regulator ID: %d\n; assuming disabled", regulator); printk(BIOS_ERR, "Invalid regulator ID: %d\n; assuming disabled", regulator);
return 0; return false;
} }

View File

@@ -25,7 +25,7 @@ enum mtk_regulator {
void mainboard_set_regulator_voltage(enum mtk_regulator regulator, uint32_t voltage_uv); void mainboard_set_regulator_voltage(enum mtk_regulator regulator, uint32_t voltage_uv);
uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator); uint32_t mainboard_get_regulator_voltage(enum mtk_regulator regulator);
int mainboard_enable_regulator(enum mtk_regulator regulator, uint8_t enable); int mainboard_enable_regulator(enum mtk_regulator regulator, bool enable);
uint8_t mainboard_regulator_is_enabled(enum mtk_regulator regulator); bool mainboard_regulator_is_enabled(enum mtk_regulator regulator);
#endif /* SOC_MEDIATEK_COMMON_REGULATOR_H */ #endif /* SOC_MEDIATEK_COMMON_REGULATOR_H */

View File

@@ -57,7 +57,6 @@ void mtk_msdc_configure_sdcard(void)
void *gpio_base = (void *)IOCFG_RM_BASE; void *gpio_base = (void *)IOCFG_RM_BASE;
void *gpio_mode0_base = (void *)MSDC1_GPIO_MODE0_BASE; void *gpio_mode0_base = (void *)MSDC1_GPIO_MODE0_BASE;
void *gpio_mode1_base = (void *)MSDC1_GPIO_MODE1_BASE; void *gpio_mode1_base = (void *)MSDC1_GPIO_MODE1_BASE;
uint8_t enable = 1;
int i; int i;
const gpio_t sdcard_pu_pin[] = { const gpio_t sdcard_pu_pin[] = {
@@ -85,6 +84,6 @@ void mtk_msdc_configure_sdcard(void)
/* set sdcard dat1 pin to msdc1 mode */ /* set sdcard dat1 pin to msdc1 mode */
clrsetbits32(gpio_mode1_base, MSDC1_GPIO_MODE1_MASK, MSDC1_GPIO_MODE1_VALUE); clrsetbits32(gpio_mode1_base, MSDC1_GPIO_MODE1_MASK, MSDC1_GPIO_MODE1_VALUE);
mainboard_enable_regulator(MTK_REGULATOR_VCC, enable); mainboard_enable_regulator(MTK_REGULATOR_VCC, true);
mainboard_enable_regulator(MTK_REGULATOR_VCCQ, enable); mainboard_enable_regulator(MTK_REGULATOR_VCCQ, true);
} }

View File

@@ -103,6 +103,6 @@ void mtk_msdc_configure_sdcard(void)
if (CONFIG(BOARD_GOOGLE_CHERRY)) if (CONFIG(BOARD_GOOGLE_CHERRY))
mt6360_init(I2C7); mt6360_init(I2C7);
mainboard_enable_regulator(MTK_REGULATOR_VCCQ, 1); mainboard_enable_regulator(MTK_REGULATOR_VCCQ, true);
mainboard_enable_regulator(MTK_REGULATOR_VCC, 1); mainboard_enable_regulator(MTK_REGULATOR_VCC, true);
} }