andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor(stpmic1): set stpmic1_is_regulator_enabled() as boolean 

Improve use and readability.

Change-Id: Ia99fc38287f36c9dd12bfe51352afa5da68c0e47
Signed-off-by: Nicolas Le Bayon <nicolas.le.bayon@st.com>
This commit is contained in:
Nicolas Le Bayon 2019-09-19 11:24:50 +02:00 committed by Yann Gautier
parent 0c16e7d2fb
commit 16e56a75de
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/st/pmic/stm32mp_pmic.c
View File

@ -6,10 +6,6 @@
#include <errno.h>
#include <libfdt.h>
#include <platform_def.h>
#include <common/debug.h>
#include <drivers/delay_timer.h>
#include <drivers/st/stm32_i2c.h>
@ -17,6 +13,9 @@
#include <drivers/st/stpmic1.h>
#include <lib/mmio.h>
#include <lib/utils_def.h>
#include <libfdt.h>
#include <platform_def.h>
#define STPMIC1_LDO12356_OUTPUT_MASK (uint8_t)(GENMASK(6, 2))
#define STPMIC1_LDO12356_OUTPUT_SHIFT 2
@ -175,7 +174,7 @@ int dt_pmic_configure_boot_on_regulators(void)
return status;
}
if (stpmic1_is_regulator_enabled(node_name) == 0U) {
if (!stpmic1_is_regulator_enabled(node_name)) {
status = stpmic1_regulator_enable(node_name);
if (status != 0) {
return status;

4
drivers/st/pmic/stpmic1.c
View File

@ -606,7 +606,7 @@ int stpmic1_regulator_disable(const char *name)
regul->enable_mask);
}
uint8_t stpmic1_is_regulator_enabled(const char *name)
bool stpmic1_is_regulator_enabled(const char *name)
{
uint8_t val;
const struct regul_struct *regul = get_regulator_data(name);
@ -615,7 +615,7 @@ uint8_t stpmic1_is_regulator_enabled(const char *name)
panic();
}
return (val & regul->enable_mask);
return (val & regul->enable_mask) == regul->enable_mask;
}
int stpmic1_regulator_voltage_set(const char *name, uint16_t millivolts)

2
include/drivers/st/stpmic1.h
View File

@ -156,7 +156,7 @@ int stpmic1_register_write(uint8_t register_id, uint8_t value);
int stpmic1_register_update(uint8_t register_id, uint8_t value, uint8_t mask);
int stpmic1_regulator_enable(const char *name);
int stpmic1_regulator_disable(const char *name);
uint8_t stpmic1_is_regulator_enabled(const char *name);
bool stpmic1_is_regulator_enabled(const char *name);
int stpmic1_regulator_voltage_set(const char *name, uint16_t millivolts);
int stpmic1_regulator_voltage_get(const char *name);
int stpmic1_regulator_pull_down_set(const char *name);