Skip to content

L
linux
Commit 0651eed5 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Mark Brown
Browse files
Options

regulator: tps65910: Provide settling time for enabling rails 

There is settling time for each rails when it is switched to
ON. Implementing enable time for returning proper settling time
of regulator rails when it is enabled.
Filling the on-time for each rail as per tps65910/tps65911
datasheets.
Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5db6d09a
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 0 deletions
drivers/regulator/tps65910-regulator.c
View file @ 0651eed5
...@@ -89,11 +89,13 @@ struct tps_info { ...@@ -89,11 +89,13 @@ struct tps_info {
unsigned max_uV; unsigned max_uV;
u8 n_voltages; u8 n_voltages;
const u16 *voltage_table; const u16 *voltage_table;
int enable_time_us;
}; };
static struct tps_info tps65910_regs[] = { static struct tps_info tps65910_regs[] = {
{ {
.name = "VRTC", .name = "VRTC",
.enable_time_us = 2200,
}, },
{ {
.name = "VIO", .name = "VIO",
...@@ -101,16 +103,19 @@ static struct tps_info tps65910_regs[] = { ...@@ -101,16 +103,19 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = ARRAY_SIZE(VIO_VSEL_table), .n_voltages = ARRAY_SIZE(VIO_VSEL_table),
.voltage_table = VIO_VSEL_table, .voltage_table = VIO_VSEL_table,
.enable_time_us = 350,
}, },
{ {
.name = "VDD1", .name = "VDD1",
.min_uV = 600000, .min_uV = 600000,
.max_uV = 4500000, .max_uV = 4500000,
.enable_time_us = 350,
}, },
{ {
.name = "VDD2", .name = "VDD2",
.min_uV = 600000, .min_uV = 600000,
.max_uV = 4500000, .max_uV = 4500000,
.enable_time_us = 350,
}, },
{ {
.name = "VDD3", .name = "VDD3",
...@@ -118,6 +123,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -118,6 +123,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 5000000, .max_uV = 5000000,
.n_voltages = ARRAY_SIZE(VDD3_VSEL_table), .n_voltages = ARRAY_SIZE(VDD3_VSEL_table),
.voltage_table = VDD3_VSEL_table, .voltage_table = VDD3_VSEL_table,
.enable_time_us = 200,
}, },
{ {
.name = "VDIG1", .name = "VDIG1",
...@@ -125,6 +131,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -125,6 +131,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 2700000, .max_uV = 2700000,
.n_voltages = ARRAY_SIZE(VDIG1_VSEL_table), .n_voltages = ARRAY_SIZE(VDIG1_VSEL_table),
.voltage_table = VDIG1_VSEL_table, .voltage_table = VDIG1_VSEL_table,
.enable_time_us = 100,
}, },
{ {
.name = "VDIG2", .name = "VDIG2",
...@@ -132,6 +139,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -132,6 +139,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 1800000, .max_uV = 1800000,
.n_voltages = ARRAY_SIZE(VDIG2_VSEL_table), .n_voltages = ARRAY_SIZE(VDIG2_VSEL_table),
.voltage_table = VDIG2_VSEL_table, .voltage_table = VDIG2_VSEL_table,
.enable_time_us = 100,
}, },
{ {
.name = "VPLL", .name = "VPLL",
...@@ -139,6 +147,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -139,6 +147,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 2500000, .max_uV = 2500000,
.n_voltages = ARRAY_SIZE(VPLL_VSEL_table), .n_voltages = ARRAY_SIZE(VPLL_VSEL_table),
.voltage_table = VPLL_VSEL_table, .voltage_table = VPLL_VSEL_table,
.enable_time_us = 100,
}, },
{ {
.name = "VDAC", .name = "VDAC",
...@@ -146,6 +155,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -146,6 +155,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 2850000, .max_uV = 2850000,
.n_voltages = ARRAY_SIZE(VDAC_VSEL_table), .n_voltages = ARRAY_SIZE(VDAC_VSEL_table),
.voltage_table = VDAC_VSEL_table, .voltage_table = VDAC_VSEL_table,
.enable_time_us = 100,
}, },
{ {
.name = "VAUX1", .name = "VAUX1",
...@@ -153,6 +163,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -153,6 +163,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 2850000, .max_uV = 2850000,
.n_voltages = ARRAY_SIZE(VAUX1_VSEL_table), .n_voltages = ARRAY_SIZE(VAUX1_VSEL_table),
.voltage_table = VAUX1_VSEL_table, .voltage_table = VAUX1_VSEL_table,
.enable_time_us = 100,
}, },
{ {
.name = "VAUX2", .name = "VAUX2",
...@@ -160,6 +171,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -160,6 +171,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = ARRAY_SIZE(VAUX2_VSEL_table), .n_voltages = ARRAY_SIZE(VAUX2_VSEL_table),
.voltage_table = VAUX2_VSEL_table, .voltage_table = VAUX2_VSEL_table,
.enable_time_us = 100,
}, },
{ {
.name = "VAUX33", .name = "VAUX33",
...@@ -167,6 +179,7 @@ static struct tps_info tps65910_regs[] = { ...@@ -167,6 +179,7 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = ARRAY_SIZE(VAUX33_VSEL_table), .n_voltages = ARRAY_SIZE(VAUX33_VSEL_table),
.voltage_table = VAUX33_VSEL_table, .voltage_table = VAUX33_VSEL_table,
.enable_time_us = 100,
}, },
{ {
.name = "VMMC", .name = "VMMC",
...@@ -174,12 +187,14 @@ static struct tps_info tps65910_regs[] = { ...@@ -174,12 +187,14 @@ static struct tps_info tps65910_regs[] = {
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = ARRAY_SIZE(VMMC_VSEL_table), .n_voltages = ARRAY_SIZE(VMMC_VSEL_table),
.voltage_table = VMMC_VSEL_table, .voltage_table = VMMC_VSEL_table,
.enable_time_us = 100,
}, },
}; };
static struct tps_info tps65911_regs[] = { static struct tps_info tps65911_regs[] = {
{ {
.name = "VRTC", .name = "VRTC",
.enable_time_us = 2200,
}, },
{ {
.name = "VIO", .name = "VIO",
...@@ -187,72 +202,84 @@ static struct tps_info tps65911_regs[] = { ...@@ -187,72 +202,84 @@ static struct tps_info tps65911_regs[] = {
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = ARRAY_SIZE(VIO_VSEL_table), .n_voltages = ARRAY_SIZE(VIO_VSEL_table),
.voltage_table = VIO_VSEL_table, .voltage_table = VIO_VSEL_table,
.enable_time_us = 350,
}, },
{ {
.name = "VDD1", .name = "VDD1",
.min_uV = 600000, .min_uV = 600000,
.max_uV = 4500000, .max_uV = 4500000,
.n_voltages = 73, .n_voltages = 73,
.enable_time_us = 350,
}, },
{ {
.name = "VDD2", .name = "VDD2",
.min_uV = 600000, .min_uV = 600000,
.max_uV = 4500000, .max_uV = 4500000,
.n_voltages = 73, .n_voltages = 73,
.enable_time_us = 350,
}, },
{ {
.name = "VDDCTRL", .name = "VDDCTRL",
.min_uV = 600000, .min_uV = 600000,
.max_uV = 1400000, .max_uV = 1400000,
.n_voltages = 65, .n_voltages = 65,
.enable_time_us = 900,
}, },
{ {
.name = "LDO1", .name = "LDO1",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 47, .n_voltages = 47,
.enable_time_us = 420,
}, },
{ {
.name = "LDO2", .name = "LDO2",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 47, .n_voltages = 47,
.enable_time_us = 420,
}, },
{ {
.name = "LDO3", .name = "LDO3",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 24, .n_voltages = 24,
.enable_time_us = 230,
}, },
{ {
.name = "LDO4", .name = "LDO4",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 47, .n_voltages = 47,
.enable_time_us = 230,
}, },
{ {
.name = "LDO5", .name = "LDO5",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 24, .n_voltages = 24,
.enable_time_us = 230,
}, },
{ {
.name = "LDO6", .name = "LDO6",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 24, .n_voltages = 24,
.enable_time_us = 230,
}, },
{ {
.name = "LDO7", .name = "LDO7",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 24, .n_voltages = 24,
.enable_time_us = 230,
}, },
{ {
.name = "LDO8", .name = "LDO8",
.min_uV = 1000000, .min_uV = 1000000,
.max_uV = 3300000, .max_uV = 3300000,
.n_voltages = 24, .n_voltages = 24,
.enable_time_us = 230,
}, },
}; };
...@@ -482,6 +509,12 @@ static int tps65910_disable(struct regulator_dev *dev) ...@@ -482,6 +509,12 @@ static int tps65910_disable(struct regulator_dev *dev)
return tps65910_clear_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED); return tps65910_clear_bits(mfd, reg, TPS65910_SUPPLY_STATE_ENABLED);
} }
static int tps65910_enable_time(struct regulator_dev *dev)
{
struct tps65910_reg *pmic = rdev_get_drvdata(dev);
int id = rdev_get_id(dev);
return pmic->info[id]->enable_time_us;
}
static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode) static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode)
{ {
...@@ -866,6 +899,7 @@ static struct regulator_ops tps65910_ops_dcdc = { ...@@ -866,6 +899,7 @@ static struct regulator_ops tps65910_ops_dcdc = {
.is_enabled = tps65910_is_enabled, .is_enabled = tps65910_is_enabled,
.enable = tps65910_enable, .enable = tps65910_enable,
.disable = tps65910_disable, .disable = tps65910_disable,
.enable_time = tps65910_enable_time,
.set_mode = tps65910_set_mode, .set_mode = tps65910_set_mode,
.get_mode = tps65910_get_mode, .get_mode = tps65910_get_mode,
.get_voltage = tps65910_get_voltage_dcdc, .get_voltage = tps65910_get_voltage_dcdc,
...@@ -877,6 +911,7 @@ static struct regulator_ops tps65910_ops_vdd3 = { ...@@ -877,6 +911,7 @@ static struct regulator_ops tps65910_ops_vdd3 = {
.is_enabled = tps65910_is_enabled, .is_enabled = tps65910_is_enabled,
.enable = tps65910_enable, .enable = tps65910_enable,
.disable = tps65910_disable, .disable = tps65910_disable,
.enable_time = tps65910_enable_time,
.set_mode = tps65910_set_mode, .set_mode = tps65910_set_mode,
.get_mode = tps65910_get_mode, .get_mode = tps65910_get_mode,
.get_voltage = tps65910_get_voltage_vdd3, .get_voltage = tps65910_get_voltage_vdd3,
...@@ -887,6 +922,7 @@ static struct regulator_ops tps65910_ops = { ...@@ -887,6 +922,7 @@ static struct regulator_ops tps65910_ops = {
.is_enabled = tps65910_is_enabled, .is_enabled = tps65910_is_enabled,
.enable = tps65910_enable, .enable = tps65910_enable,
.disable = tps65910_disable, .disable = tps65910_disable,
.enable_time = tps65910_enable_time,
.set_mode = tps65910_set_mode, .set_mode = tps65910_set_mode,
.get_mode = tps65910_get_mode, .get_mode = tps65910_get_mode,
.get_voltage = tps65910_get_voltage, .get_voltage = tps65910_get_voltage,
...@@ -898,6 +934,7 @@ static struct regulator_ops tps65911_ops = { ...@@ -898,6 +934,7 @@ static struct regulator_ops tps65911_ops = {
.is_enabled = tps65910_is_enabled, .is_enabled = tps65910_is_enabled,
.enable = tps65910_enable, .enable = tps65910_enable,
.disable = tps65910_disable, .disable = tps65910_disable,
.enable_time = tps65910_enable_time,
.set_mode = tps65910_set_mode, .set_mode = tps65910_set_mode,
.get_mode = tps65910_get_mode, .get_mode = tps65910_get_mode,
.get_voltage = tps65911_get_voltage, .get_voltage = tps65911_get_voltage,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7