smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-pmic

Browse Source
This commit is contained in:
Tom Rini
2025-01-14 09:35:43 -06:00
parent 6a0db9ee03 b9fe3ec8a2
commit ecc2bd711a
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/power/pmic/tps65941.c
View File

@@ -74,7 +74,7 @@ static const struct udevice_id tps65941_ids[] = {
{ .compatible = "ti,tps659412", .data = TPS659411 },
{ .compatible = "ti,tps659413", .data = TPS659413 },
{ .compatible = "ti,lp876441", .data = LP876441 },
{ .compatible = "ti,tps65224", .data = TPS65224 },
{ .compatible = "ti,tps65224-q1", .data = TPS65224 },
{ .compatible = "ti,tps6594-q1", .data = TPS659411 },
{ .compatible = "ti,tps6593-q1", .data = TPS659413 },
{ .compatible = "ti,lp8764-q1", .data = LP876441 },

30
drivers/power/regulator/tps65219_regulator.c
View File

@@ -72,12 +72,12 @@ static int tps65219_buck_enable(struct udevice *dev, int op, bool *enable)
static int tps65219_buck_volt2val(int uV)
{
if (uV > TPS65219_BUCK_VOLT_MAX)
if (uV > TPS65219_BUCK_3V4)
return -EINVAL;
else if (uV >= 1400000)
return (uV - 1400000) / 100000 + 0x20;
else if (uV >= 600000)
return (uV - 600000) / 25000 + 0x00;
else if (uV >= TPS65219_BUCK_1V4)
return (uV - TPS65219_BUCK_1V4) / TPS65219_VOLT_STEP_100MV + TPS65219_BUCK_REG_1V4;
else if (uV >= TPS65219_BUCK_0V6)
return (uV - TPS65219_BUCK_0V6) / TPS65219_VOLT_STEP_25MV + TPS65219_BUCK_REG_0V6;
else
return -EINVAL;
}
@@ -86,12 +86,12 @@ static int tps65219_buck_val2volt(int val)
{
if (val > TPS65219_VOLT_MASK)
return -EINVAL;
else if (val > 0x34)
return TPS65219_BUCK_VOLT_MAX;
else if (val > 0x20)
return 1400000 + (val - 0x20) * 100000;
else if (val >= 0)
return 600000 + val * 25000;
else if (val > TPS65219_BUCK_REG_3V4)
return TPS65219_BUCK_3V4;
else if (val > TPS65219_BUCK_REG_1V4)
return TPS65219_BUCK_1V4 + (val - TPS65219_BUCK_REG_1V4) * TPS65219_VOLT_STEP_100MV;
else if (val >= TPS65219_BUCK_REG_0V6)
return TPS65219_BUCK_0V6 + val * TPS65219_VOLT_STEP_25MV;
else
return -EINVAL;
}
@@ -161,7 +161,7 @@ static int tps65219_ldo_volt2val(int idx, int uV)
if (uV > max)
return -EINVAL;
else if (uV >= base)
return (uV - TPS65219_LDO12_VOLT_MIN) / 50000;
return (uV - TPS65219_LDO12_VOLT_MIN) / TPS65219_VOLT_STEP_50MV;
else
return -EINVAL;
}
@@ -187,7 +187,7 @@ static int tps65219_ldo_val2volt(int idx, int val)
else if (val <= reg_base)
return base;
else if (val >= 0)
return TPS65219_LDO12_VOLT_MIN + (50000 * val);
return TPS65219_LDO12_VOLT_MIN + (TPS65219_VOLT_STEP_50MV * val);
else
return -EINVAL;
}
@@ -250,7 +250,7 @@ static int tps65219_ldo_probe(struct udevice *dev)
/* idx must be in 1..TPS65219_LDO_NUM */
idx = dev->driver_data;
if (idx < 1 || idx > TPS65219_LDO_NUM) {
printf("Wrong ID for regulator\n");
pr_err("Wrong ID for regulator\n");
return -EINVAL;
}
@@ -271,7 +271,7 @@ static int tps65219_buck_probe(struct udevice *dev)
/* idx must be in 1..TPS65219_BUCK_NUM */
idx = dev->driver_data;
if (idx < 1 || idx > TPS65219_BUCK_NUM) {
printf("Wrong ID for regulator\n");
pr_err("Wrong ID for regulator\n");
return -EINVAL;
}

14
include/power/tps65219.h
View File

@@ -17,10 +17,20 @@
#define TPS65219_BUCK_DRIVER "tps65219_buck"
#define TPS65219_VOLT_MASK 0x3F
#define TPS65219_BUCK_VOLT_MAX 3400000
#define TPS65219_ENABLE_CTRL_REG 0x2
#define TPS65219_VOLT_STEP_25MV 25000
#define TPS65219_VOLT_STEP_50MV 50000
#define TPS65219_VOLT_STEP_100MV 100000
#define TPS65219_BUCK_0V6 600000
#define TPS65219_BUCK_1V4 1400000
#define TPS65219_BUCK_3V4 3400000
#define TPS65219_BUCK_REG_0V6 0x00
#define TPS65219_BUCK_REG_1V4 0x20
#define TPS65219_BUCK_REG_3V4 0x34
#define TPS65219_BUCK1_VOUT_REG 0xa
#define TPS65219_BUCK2_VOUT_REG 0x9
#define TPS65219_BUCK3_VOUT_REG 0x8