mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-24 05:54:08 +00:00
feat(st-pmic): register the PMIC to regulator framework
Register the PMIC to the regulator framework. Change-Id: Ic825a8ef08505316db3dbd5944d62ea907f73c4a Signed-off-by: Pascal Paillet <p.paillet@st.com> Signed-off-by: Yann Gautier <yann.gautier@foss.st.com>
This commit is contained in:
Yann Gautier
Yann Gautier
parent
ae7792e058
commit
85fb175b5e
2 changed files with 177 additions and 91 deletions
|
|
@ -4,10 +4,12 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <common/debug.h>
|
||||
#include <drivers/delay_timer.h>
|
||||
#include <drivers/st/regulator.h>
|
||||
#include <drivers/st/stm32_i2c.h>
|
||||
#include <drivers/st/stm32mp_pmic.h>
|
||||
#include <drivers/st/stpmic1.h>
|
||||
|
|
@ -32,6 +34,8 @@
|
|||
static struct i2c_handle_s i2c_handle;
|
||||
static uint32_t pmic_i2c_addr;
|
||||
|
||||
static int register_pmic(void);
|
||||
|
||||
static int dt_get_pmic_node(void *fdt)
|
||||
{
|
||||
static int node = -FDT_ERR_BADOFFSET;
|
||||
|
|
@ -125,86 +129,6 @@ static int dt_pmic_i2c_config(struct dt_node_info *i2c_info,
|
|||
return stm32_i2c_get_setup_from_fdt(fdt, i2c_node, init);
|
||||
}
|
||||
|
||||
int dt_pmic_configure_boot_on_regulators(void)
|
||||
{
|
||||
int pmic_node, regulators_node, regulator_node;
|
||||
void *fdt;
|
||||
|
||||
if (fdt_get_address(&fdt) == 0) {
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
pmic_node = dt_get_pmic_node(fdt);
|
||||
if (pmic_node < 0) {
|
||||
return -FDT_ERR_NOTFOUND;
|
||||
}
|
||||
|
||||
regulators_node = fdt_subnode_offset(fdt, pmic_node, "regulators");
|
||||
if (regulators_node < 0) {
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
fdt_for_each_subnode(regulator_node, fdt, regulators_node) {
|
||||
const fdt32_t *cuint;
|
||||
const char *node_name = fdt_get_name(fdt, regulator_node, NULL);
|
||||
uint16_t voltage;
|
||||
int status;
|
||||
|
||||
#if defined(IMAGE_BL2)
|
||||
if ((fdt_getprop(fdt, regulator_node, "regulator-boot-on",
|
||||
NULL) == NULL) &&
|
||||
(fdt_getprop(fdt, regulator_node, "regulator-always-on",
|
||||
NULL) == NULL)) {
|
||||
#else
|
||||
if (fdt_getprop(fdt, regulator_node, "regulator-boot-on",
|
||||
NULL) == NULL) {
|
||||
#endif
|
||||
continue;
|
||||
}
|
||||
|
||||
if (fdt_getprop(fdt, regulator_node, "regulator-pull-down",
|
||||
NULL) != NULL) {
|
||||
|
||||
status = stpmic1_regulator_pull_down_set(node_name);
|
||||
if (status != 0) {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
if (fdt_getprop(fdt, regulator_node, "st,mask-reset",
|
||||
NULL) != NULL) {
|
||||
|
||||
status = stpmic1_regulator_mask_reset_set(node_name);
|
||||
if (status != 0) {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
||||
cuint = fdt_getprop(fdt, regulator_node,
|
||||
"regulator-min-microvolt", NULL);
|
||||
if (cuint == NULL) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/* DT uses microvolts, whereas driver awaits millivolts */
|
||||
voltage = (uint16_t)(fdt32_to_cpu(*cuint) / 1000U);
|
||||
|
||||
status = stpmic1_regulator_voltage_set(node_name, voltage);
|
||||
if (status != 0) {
|
||||
return status;
|
||||
}
|
||||
|
||||
if (!stpmic1_is_regulator_enabled(node_name)) {
|
||||
status = stpmic1_regulator_enable(node_name);
|
||||
if (status != 0) {
|
||||
return status;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool initialize_pmic_i2c(void)
|
||||
{
|
||||
int ret;
|
||||
|
|
@ -277,9 +201,14 @@ void initialize_pmic(void)
|
|||
|
||||
register_pmic_shared_peripherals();
|
||||
|
||||
if (dt_pmic_configure_boot_on_regulators() < 0) {
|
||||
if (register_pmic() < 0) {
|
||||
panic();
|
||||
};
|
||||
}
|
||||
|
||||
if (stpmic1_powerctrl_on() < 0) {
|
||||
panic();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
|
|
@ -293,7 +222,6 @@ void print_pmic_info_and_debug(void)
|
|||
}
|
||||
|
||||
INFO("PMIC version = 0x%02lx\n", pmic_version);
|
||||
stpmic1_dump_regulators();
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -414,3 +342,169 @@ int pmic_ddr_power_init(enum ddr_type ddr_type)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
enum {
|
||||
STPMIC1_BUCK1 = 0,
|
||||
STPMIC1_BUCK2,
|
||||
STPMIC1_BUCK3,
|
||||
STPMIC1_BUCK4,
|
||||
STPMIC1_LDO1,
|
||||
STPMIC1_LDO2,
|
||||
STPMIC1_LDO3,
|
||||
STPMIC1_LDO4,
|
||||
STPMIC1_LDO5,
|
||||
STPMIC1_LDO6,
|
||||
STPMIC1_VREF_DDR,
|
||||
STPMIC1_BOOST,
|
||||
STPMIC1_VBUS_OTG,
|
||||
STPMIC1_SW_OUT,
|
||||
};
|
||||
|
||||
static int pmic_set_state(const struct regul_description *desc, bool enable)
|
||||
{
|
||||
VERBOSE("%s: set state to %u\n", desc->node_name, enable);
|
||||
|
||||
if (enable == STATE_ENABLE) {
|
||||
return stpmic1_regulator_enable(desc->node_name);
|
||||
} else {
|
||||
return stpmic1_regulator_disable(desc->node_name);
|
||||
}
|
||||
}
|
||||
|
||||
static int pmic_get_state(const struct regul_description *desc)
|
||||
{
|
||||
VERBOSE("%s: get state\n", desc->node_name);
|
||||
|
||||
return stpmic1_is_regulator_enabled(desc->node_name);
|
||||
}
|
||||
|
||||
static int pmic_get_voltage(const struct regul_description *desc)
|
||||
{
|
||||
VERBOSE("%s: get volt\n", desc->node_name);
|
||||
|
||||
return stpmic1_regulator_voltage_get(desc->node_name);
|
||||
}
|
||||
|
||||
static int pmic_set_voltage(const struct regul_description *desc, uint16_t mv)
|
||||
{
|
||||
VERBOSE("%s: get volt\n", desc->node_name);
|
||||
|
||||
return stpmic1_regulator_voltage_set(desc->node_name, mv);
|
||||
}
|
||||
|
||||
static int pmic_list_voltages(const struct regul_description *desc,
|
||||
const uint16_t **levels, size_t *count)
|
||||
{
|
||||
VERBOSE("%s: list volt\n", desc->node_name);
|
||||
|
||||
return stpmic1_regulator_levels_mv(desc->node_name, levels, count);
|
||||
}
|
||||
|
||||
static int pmic_set_flag(const struct regul_description *desc, uint16_t flag)
|
||||
{
|
||||
VERBOSE("%s: set_flag 0x%x\n", desc->node_name, flag);
|
||||
|
||||
switch (flag) {
|
||||
case REGUL_OCP:
|
||||
return stpmic1_regulator_icc_set(desc->node_name);
|
||||
|
||||
case REGUL_ACTIVE_DISCHARGE:
|
||||
return stpmic1_active_discharge_mode_set(desc->node_name);
|
||||
|
||||
case REGUL_PULL_DOWN:
|
||||
return stpmic1_regulator_pull_down_set(desc->node_name);
|
||||
|
||||
case REGUL_MASK_RESET:
|
||||
return stpmic1_regulator_mask_reset_set(desc->node_name);
|
||||
|
||||
case REGUL_SINK_SOURCE:
|
||||
return stpmic1_regulator_sink_mode_set(desc->node_name);
|
||||
|
||||
case REGUL_ENABLE_BYPASS:
|
||||
return stpmic1_regulator_bypass_mode_set(desc->node_name);
|
||||
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
struct regul_ops pmic_ops = {
|
||||
.set_state = pmic_set_state,
|
||||
.get_state = pmic_get_state,
|
||||
.set_voltage = pmic_set_voltage,
|
||||
.get_voltage = pmic_get_voltage,
|
||||
.list_voltages = pmic_list_voltages,
|
||||
.set_flag = pmic_set_flag,
|
||||
};
|
||||
|
||||
#define DEFINE_REGU(name) { \
|
||||
.node_name = name, \
|
||||
.ops = &pmic_ops, \
|
||||
.driver_data = NULL, \
|
||||
.enable_ramp_delay = 1000, \
|
||||
}
|
||||
|
||||
static const struct regul_description pmic_regs[] = {
|
||||
[STPMIC1_BUCK1] = DEFINE_REGU("buck1"),
|
||||
[STPMIC1_BUCK2] = DEFINE_REGU("buck2"),
|
||||
[STPMIC1_BUCK3] = DEFINE_REGU("buck3"),
|
||||
[STPMIC1_BUCK4] = DEFINE_REGU("buck4"),
|
||||
[STPMIC1_LDO1] = DEFINE_REGU("ldo1"),
|
||||
[STPMIC1_LDO2] = DEFINE_REGU("ldo2"),
|
||||
[STPMIC1_LDO3] = DEFINE_REGU("ldo3"),
|
||||
[STPMIC1_LDO4] = DEFINE_REGU("ldo4"),
|
||||
[STPMIC1_LDO5] = DEFINE_REGU("ldo5"),
|
||||
[STPMIC1_LDO6] = DEFINE_REGU("ldo6"),
|
||||
[STPMIC1_VREF_DDR] = DEFINE_REGU("vref_ddr"),
|
||||
[STPMIC1_BOOST] = DEFINE_REGU("boost"),
|
||||
[STPMIC1_VBUS_OTG] = DEFINE_REGU("pwr_sw1"),
|
||||
[STPMIC1_SW_OUT] = DEFINE_REGU("pwr_sw2"),
|
||||
};
|
||||
|
||||
#define NB_REG ARRAY_SIZE(pmic_regs)
|
||||
|
||||
static int register_pmic(void)
|
||||
{
|
||||
void *fdt;
|
||||
int pmic_node, regulators_node, subnode;
|
||||
|
||||
VERBOSE("Register pmic\n");
|
||||
|
||||
if (fdt_get_address(&fdt) == 0) {
|
||||
return -FDT_ERR_NOTFOUND;
|
||||
}
|
||||
|
||||
pmic_node = dt_get_pmic_node(fdt);
|
||||
if (pmic_node < 0) {
|
||||
return pmic_node;
|
||||
}
|
||||
|
||||
regulators_node = fdt_subnode_offset(fdt, pmic_node, "regulators");
|
||||
if (regulators_node < 0) {
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
fdt_for_each_subnode(subnode, fdt, regulators_node) {
|
||||
const char *reg_name = fdt_get_name(fdt, subnode, NULL);
|
||||
const struct regul_description *desc;
|
||||
unsigned int i;
|
||||
int ret;
|
||||
|
||||
for (i = 0; i < NB_REG; i++) {
|
||||
desc = &pmic_regs[i];
|
||||
if (strcmp(desc->node_name, reg_name) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert(i < NB_REG);
|
||||
|
||||
ret = regulator_register(desc, subnode);
|
||||
if (ret != 0) {
|
||||
WARN("%s:%d failed to register %s\n", __func__,
|
||||
__LINE__, reg_name);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,14 +19,6 @@
|
|||
*/
|
||||
int dt_pmic_status(void);
|
||||
|
||||
/*
|
||||
* dt_pmic_configure_boot_on_regulators - Configure boot-on and always-on
|
||||
* regulators from device tree configuration
|
||||
*
|
||||
* Returns 0 on success, and negative values on errors
|
||||
*/
|
||||
int dt_pmic_configure_boot_on_regulators(void);
|
||||
|
||||
/*
|
||||
* initialize_pmic_i2c - Initialize I2C for the PMIC control
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue