mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-17 10:31:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-pmic

Browse Source
This commit is contained in:
Tom Rini 2022-07-27 07:00:24 -04:00
commit 8005908e8f
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/power/regulator/pca9450.c
View File

@ -44,7 +44,6 @@ struct pca9450_vrange {
* @ranges: pointer to ranges of regulator voltages and matching register * @ranges: pointer to ranges of regulator voltages and matching register
* values * values
* @numranges: number of voltage ranges pointed by ranges * @numranges: number of voltage ranges pointed by ranges
* @dvs: whether the voltage can be changed when regulator is enabled
*/ */
struct pca9450_plat { struct pca9450_plat {
const char *name; const char *name;
@ -54,7 +53,6 @@ struct pca9450_plat {
u8 volt_mask; u8 volt_mask;
struct pca9450_vrange *ranges; struct pca9450_vrange *ranges;
unsigned int numranges; unsigned int numranges;
bool dvs;
}; };
#define PCA_RANGE(_min, _vstep, _sel_low, _sel_hi) \ #define PCA_RANGE(_min, _vstep, _sel_low, _sel_hi) \
@ -63,11 +61,11 @@ struct pca9450_plat {
.min_sel = (_sel_low), .max_sel = (_sel_hi), \ .min_sel = (_sel_low), .max_sel = (_sel_hi), \
} }
#define PCA_DATA(_name, enreg, enmask, vreg, vmask, _range, _dvs) \ #define PCA_DATA(_name, enreg, enmask, vreg, vmask, _range) \
{ \ { \
.name = (_name), .enable_reg = (enreg), .enablemask = (enmask), \ .name = (_name), .enable_reg = (enreg), .enablemask = (enmask), \
.volt_reg = (vreg), .volt_mask = (vmask), .ranges = (_range), \ .volt_reg = (vreg), .volt_mask = (vmask), .ranges = (_range), \
.numranges = ARRAY_SIZE(_range), .dvs = (_dvs), \ .numranges = ARRAY_SIZE(_range) \
} }
static struct pca9450_vrange pca9450_buck123_vranges[] = { static struct pca9450_vrange pca9450_buck123_vranges[] = {
@ -107,39 +105,39 @@ static struct pca9450_plat pca9450_reg_data[] = {
/* Bucks 1-3 which support dynamic voltage scaling */ /* Bucks 1-3 which support dynamic voltage scaling */
PCA_DATA("BUCK1", PCA9450_BUCK1CTRL, HW_STATE_CONTROL, PCA_DATA("BUCK1", PCA9450_BUCK1CTRL, HW_STATE_CONTROL,
PCA9450_BUCK1OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK, PCA9450_BUCK1OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK,
pca9450_buck123_vranges, true), pca9450_buck123_vranges),
PCA_DATA("BUCK2", PCA9450_BUCK2CTRL, HW_STATE_CONTROL, PCA_DATA("BUCK2", PCA9450_BUCK2CTRL, HW_STATE_CONTROL,
PCA9450_BUCK2OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK, PCA9450_BUCK2OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK,
pca9450_buck123_vranges, true), pca9450_buck123_vranges),
PCA_DATA("BUCK3", PCA9450_BUCK3CTRL, HW_STATE_CONTROL, PCA_DATA("BUCK3", PCA9450_BUCK3CTRL, HW_STATE_CONTROL,
PCA9450_BUCK3OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK, PCA9450_BUCK3OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK,
pca9450_buck123_vranges, true), pca9450_buck123_vranges),
/* Bucks 4-6 which do not support dynamic voltage scaling */ /* Bucks 4-6 which do not support dynamic voltage scaling */
PCA_DATA("BUCK4", PCA9450_BUCK4CTRL, HW_STATE_CONTROL, PCA_DATA("BUCK4", PCA9450_BUCK4CTRL, HW_STATE_CONTROL,
PCA9450_BUCK4OUT, PCA9450_DVS_BUCK_RUN_MASK, PCA9450_BUCK4OUT, PCA9450_DVS_BUCK_RUN_MASK,
pca9450_buck456_vranges, false), pca9450_buck456_vranges),
PCA_DATA("BUCK5", PCA9450_BUCK5CTRL, HW_STATE_CONTROL, PCA_DATA("BUCK5", PCA9450_BUCK5CTRL, HW_STATE_CONTROL,
PCA9450_BUCK5OUT, PCA9450_DVS_BUCK_RUN_MASK, PCA9450_BUCK5OUT, PCA9450_DVS_BUCK_RUN_MASK,
pca9450_buck456_vranges, false), pca9450_buck456_vranges),
PCA_DATA("BUCK6", PCA9450_BUCK6CTRL, HW_STATE_CONTROL, PCA_DATA("BUCK6", PCA9450_BUCK6CTRL, HW_STATE_CONTROL,
PCA9450_BUCK6OUT, PCA9450_DVS_BUCK_RUN_MASK, PCA9450_BUCK6OUT, PCA9450_DVS_BUCK_RUN_MASK,
pca9450_buck456_vranges, false), pca9450_buck456_vranges),
/* LDOs */ /* LDOs */
PCA_DATA("LDO1", PCA9450_LDO1CTRL, HW_STATE_CONTROL, PCA_DATA("LDO1", PCA9450_LDO1CTRL, HW_STATE_CONTROL,
PCA9450_LDO1CTRL, PCA9450_LDO12_MASK, PCA9450_LDO1CTRL, PCA9450_LDO12_MASK,
pca9450_ldo1_vranges, false), pca9450_ldo1_vranges),
PCA_DATA("LDO2", PCA9450_LDO2CTRL, HW_STATE_CONTROL, PCA_DATA("LDO2", PCA9450_LDO2CTRL, HW_STATE_CONTROL,
PCA9450_LDO2CTRL, PCA9450_LDO12_MASK, PCA9450_LDO2CTRL, PCA9450_LDO12_MASK,
pca9450_ldo2_vranges, false), pca9450_ldo2_vranges),
PCA_DATA("LDO3", PCA9450_LDO3CTRL, HW_STATE_CONTROL, PCA_DATA("LDO3", PCA9450_LDO3CTRL, HW_STATE_CONTROL,
PCA9450_LDO3CTRL, PCA9450_LDO34_MASK, PCA9450_LDO3CTRL, PCA9450_LDO34_MASK,
pca9450_ldo34_vranges, false), pca9450_ldo34_vranges),
PCA_DATA("LDO4", PCA9450_LDO4CTRL, HW_STATE_CONTROL, PCA_DATA("LDO4", PCA9450_LDO4CTRL, HW_STATE_CONTROL,
PCA9450_LDO4CTRL, PCA9450_LDO34_MASK, PCA9450_LDO4CTRL, PCA9450_LDO34_MASK,
pca9450_ldo34_vranges, false), pca9450_ldo34_vranges),
PCA_DATA("LDO5", PCA9450_LDO5CTRL_H, HW_STATE_CONTROL, PCA_DATA("LDO5", PCA9450_LDO5CTRL_H, HW_STATE_CONTROL,
PCA9450_LDO5CTRL_H, PCA9450_LDO5_MASK, PCA9450_LDO5CTRL_H, PCA9450_LDO5_MASK,
pca9450_ldo5_vranges, false), pca9450_ldo5_vranges),
}; };
static int vrange_find_value(struct pca9450_vrange *r, unsigned int sel, static int vrange_find_value(struct pca9450_vrange *r, unsigned int sel,
@ -246,20 +244,6 @@ static int pca9450_set_value(struct udevice *dev, int uvolt)
unsigned int sel; unsigned int sel;
int i, found = 0; int i, found = 0;
/*
* An under/overshooting may occur if voltage is changed for other
* regulators but buck 1,2,3 or 4 when regulator is enabled. Prevent
* change to protect the HW
*/
if (!plat->dvs)
if (pca9450_get_enable(dev)) {
/* If the value is already set, skip the warning. */
if (pca9450_get_value(dev) == uvolt)
return 0;
pr_err("Only DVS bucks can be changed when enabled\n");
return -EINVAL;
}
for (i = 0; i < plat->numranges; i++) { for (i = 0; i < plat->numranges; i++) {
struct pca9450_vrange *r = &plat->ranges[i]; struct pca9450_vrange *r = &plat->ranges[i];