* [PATCH V1 0/2] Settling time for rails on/voltage change @ 2012-03-13 6:05 Laxman Dewangan 2012-03-13 6:05 ` [PATCH V1 1/2] regulator: tps65910: Provide settling time for enabling rails Laxman Dewangan 2012-03-13 6:05 ` [PATCH V1 2/2] regulator: tps65910: Provide settling time for DCDC voltage change Laxman Dewangan 0 siblings, 2 replies; 6+ messages in thread From: Laxman Dewangan @ 2012-03-13 6:05 UTC (permalink / raw) To: lrg, broonie, axel.lin; +Cc: linux-kernel, ldewangan Settling time is require to stabilize output when either switched to ON or change voltage. These patch set provide the settling delay when switch to ON or when doing voltage change. Laxman Dewangan (2): regulator: tps65910: Provide settling time for enabling rails. Settling time for switching to ON. regulator: tps65910: Provide settling time for DCDC voltage change Settling time for stabilizing voltage output of DCDC rail. drivers/regulator/tps65910-regulator.c | 82 +++++++++++++++++++++++++++----- 1 files changed, 69 insertions(+), 13 deletions(-) ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH V1 1/2] regulator: tps65910: Provide settling time for enabling rails. 2012-03-13 6:05 [PATCH V1 0/2] Settling time for rails on/voltage change Laxman Dewangan @ 2012-03-13 6:05 ` Laxman Dewangan 2012-03-13 23:22 ` Mark Brown 2012-03-13 6:05 ` [PATCH V1 2/2] regulator: tps65910: Provide settling time for DCDC voltage change Laxman Dewangan 1 sibling, 1 reply; 6+ messages in thread From: Laxman Dewangan @ 2012-03-13 6:05 UTC (permalink / raw) To: lrg, broonie, axel.lin; +Cc: linux-kernel, ldewangan 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: Laxman Dewangan <ldewangan@nvidia.com> --- drivers/regulator/tps65910-regulator.c | 37 ++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 8074d51..9084664 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -89,11 +89,13 @@ struct tps_info { unsigned max_uV; u8 n_voltages; const u16 *voltage_table; + int enable_time_us; }; static struct tps_info tps65910_regs[] = { { .name = "VRTC", + .enable_time_us = 2200, }, { .name = "VIO", @@ -101,16 +103,19 @@ static struct tps_info tps65910_regs[] = { .max_uV = 3300000, .n_voltages = ARRAY_SIZE(VIO_VSEL_table), .voltage_table = VIO_VSEL_table, + .enable_time_us = 350, }, { .name = "VDD1", .min_uV = 600000, .max_uV = 4500000, + .enable_time_us = 350, }, { .name = "VDD2", .min_uV = 600000, .max_uV = 4500000, + .enable_time_us = 350, }, { .name = "VDD3", @@ -118,6 +123,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 5000000, .n_voltages = ARRAY_SIZE(VDD3_VSEL_table), .voltage_table = VDD3_VSEL_table, + .enable_time_us = 200, }, { .name = "VDIG1", @@ -125,6 +131,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 2700000, .n_voltages = ARRAY_SIZE(VDIG1_VSEL_table), .voltage_table = VDIG1_VSEL_table, + .enable_time_us = 100, }, { .name = "VDIG2", @@ -132,6 +139,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 1800000, .n_voltages = ARRAY_SIZE(VDIG2_VSEL_table), .voltage_table = VDIG2_VSEL_table, + .enable_time_us = 100, }, { .name = "VPLL", @@ -139,6 +147,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 2500000, .n_voltages = ARRAY_SIZE(VPLL_VSEL_table), .voltage_table = VPLL_VSEL_table, + .enable_time_us = 100, }, { .name = "VDAC", @@ -146,6 +155,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 2850000, .n_voltages = ARRAY_SIZE(VDAC_VSEL_table), .voltage_table = VDAC_VSEL_table, + .enable_time_us = 100, }, { .name = "VAUX1", @@ -153,6 +163,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 2850000, .n_voltages = ARRAY_SIZE(VAUX1_VSEL_table), .voltage_table = VAUX1_VSEL_table, + .enable_time_us = 100, }, { .name = "VAUX2", @@ -160,6 +171,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 3300000, .n_voltages = ARRAY_SIZE(VAUX2_VSEL_table), .voltage_table = VAUX2_VSEL_table, + .enable_time_us = 100, }, { .name = "VAUX33", @@ -167,6 +179,7 @@ static struct tps_info tps65910_regs[] = { .max_uV = 3300000, .n_voltages = ARRAY_SIZE(VAUX33_VSEL_table), .voltage_table = VAUX33_VSEL_table, + .enable_time_us = 100, }, { .name = "VMMC", @@ -174,12 +187,14 @@ static struct tps_info tps65910_regs[] = { .max_uV = 3300000, .n_voltages = ARRAY_SIZE(VMMC_VSEL_table), .voltage_table = VMMC_VSEL_table, + .enable_time_us = 100, }, }; static struct tps_info tps65911_regs[] = { { .name = "VRTC", + .enable_time_us = 2200, }, { .name = "VIO", @@ -187,72 +202,84 @@ static struct tps_info tps65911_regs[] = { .max_uV = 3300000, .n_voltages = ARRAY_SIZE(VIO_VSEL_table), .voltage_table = VIO_VSEL_table, + .enable_time_us = 350, }, { .name = "VDD1", .min_uV = 600000, .max_uV = 4500000, .n_voltages = 73, + .enable_time_us = 350, }, { .name = "VDD2", .min_uV = 600000, .max_uV = 4500000, .n_voltages = 73, + .enable_time_us = 350, }, { .name = "VDDCTRL", .min_uV = 600000, .max_uV = 1400000, .n_voltages = 65, + .enable_time_us = 900, }, { .name = "LDO1", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 47, + .enable_time_us = 420, }, { .name = "LDO2", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 47, + .enable_time_us = 420, }, { .name = "LDO3", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 24, + .enable_time_us = 230, }, { .name = "LDO4", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 47, + .enable_time_us = 230, }, { .name = "LDO5", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 24, + .enable_time_us = 230, }, { .name = "LDO6", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 24, + .enable_time_us = 230, }, { .name = "LDO7", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 24, + .enable_time_us = 230, }, { .name = "LDO8", .min_uV = 1000000, .max_uV = 3300000, .n_voltages = 24, + .enable_time_us = 230, }, }; @@ -482,6 +509,12 @@ static int tps65910_disable(struct regulator_dev *dev) 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) { @@ -864,6 +897,7 @@ static struct regulator_ops tps65910_ops_dcdc = { .is_enabled = tps65910_is_enabled, .enable = tps65910_enable, .disable = tps65910_disable, + .enable_time = tps65910_enable_time, .set_mode = tps65910_set_mode, .get_mode = tps65910_get_mode, .get_voltage = tps65910_get_voltage_dcdc, @@ -875,6 +909,7 @@ static struct regulator_ops tps65910_ops_vdd3 = { .is_enabled = tps65910_is_enabled, .enable = tps65910_enable, .disable = tps65910_disable, + .enable_time = tps65910_enable_time, .set_mode = tps65910_set_mode, .get_mode = tps65910_get_mode, .get_voltage = tps65910_get_voltage_vdd3, @@ -885,6 +920,7 @@ static struct regulator_ops tps65910_ops = { .is_enabled = tps65910_is_enabled, .enable = tps65910_enable, .disable = tps65910_disable, + .enable_time = tps65910_enable_time, .set_mode = tps65910_set_mode, .get_mode = tps65910_get_mode, .get_voltage = tps65910_get_voltage, @@ -896,6 +932,7 @@ static struct regulator_ops tps65911_ops = { .is_enabled = tps65910_is_enabled, .enable = tps65910_enable, .disable = tps65910_disable, + .enable_time = tps65910_enable_time, .set_mode = tps65910_set_mode, .get_mode = tps65910_get_mode, .get_voltage = tps65911_get_voltage, -- 1.7.1.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V1 1/2] regulator: tps65910: Provide settling time for enabling rails. 2012-03-13 6:05 ` [PATCH V1 1/2] regulator: tps65910: Provide settling time for enabling rails Laxman Dewangan @ 2012-03-13 23:22 ` Mark Brown 0 siblings, 0 replies; 6+ messages in thread From: Mark Brown @ 2012-03-13 23:22 UTC (permalink / raw) To: Laxman Dewangan; +Cc: lrg, axel.lin, linux-kernel [-- Attachment #1: Type: text/plain, Size: 328 bytes --] On Tue, Mar 13, 2012 at 11:35:20AM +0530, Laxman Dewangan wrote: > 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. Applied, thanks. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH V1 2/2] regulator: tps65910: Provide settling time for DCDC voltage change 2012-03-13 6:05 [PATCH V1 0/2] Settling time for rails on/voltage change Laxman Dewangan 2012-03-13 6:05 ` [PATCH V1 1/2] regulator: tps65910: Provide settling time for enabling rails Laxman Dewangan @ 2012-03-13 6:05 ` Laxman Dewangan 2012-03-13 23:23 ` Mark Brown 1 sibling, 1 reply; 6+ messages in thread From: Laxman Dewangan @ 2012-03-13 6:05 UTC (permalink / raw) To: lrg, broonie, axel.lin; +Cc: linux-kernel, ldewangan Settling time is require when there is dcdc rail's voltage change. Returning proper delay time for dcdc voltage change to settle down the output voltage to new value. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> --- drivers/regulator/tps65910-regulator.c | 45 ++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 13 deletions(-) diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 9084664..c99091d 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -561,10 +561,10 @@ static unsigned int tps65910_get_mode(struct regulator_dev *dev) return REGULATOR_MODE_NORMAL; } -static int tps65910_get_voltage_dcdc(struct regulator_dev *dev) +static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev) { struct tps65910_reg *pmic = rdev_get_drvdata(dev); - int id = rdev_get_id(dev), voltage = 0; + int id = rdev_get_id(dev); int opvsel = 0, srvsel = 0, vselmax = 0, mult = 0, sr = 0; switch (id) { @@ -608,9 +608,7 @@ static int tps65910_get_voltage_dcdc(struct regulator_dev *dev) srvsel = 3; if (srvsel > vselmax) srvsel = vselmax; - srvsel -= 3; - - voltage = (srvsel * VDD1_2_OFFSET + VDD1_2_MIN_VOLT) * 100; + return srvsel - 3; } else { /* normalise to valid range*/ @@ -618,14 +616,9 @@ static int tps65910_get_voltage_dcdc(struct regulator_dev *dev) opvsel = 3; if (opvsel > vselmax) opvsel = vselmax; - opvsel -= 3; - - voltage = (opvsel * VDD1_2_OFFSET + VDD1_2_MIN_VOLT) * 100; + return opvsel - 3; } - - voltage *= mult; - - return voltage; + return -EINVAL; } static int tps65910_get_voltage(struct regulator_dev *dev) @@ -892,6 +885,31 @@ static int tps65911_list_voltage(struct regulator_dev *dev, unsigned selector) return (LDO_MIN_VOLT + selector * step_mv) * 1000; } +static int tps65910_set_voltage_dcdc_time_sel(struct regulator_dev *dev, + unsigned int old_selector, unsigned int new_selector) +{ + int id = rdev_get_id(dev); + int old_volt, new_volt; + + old_volt = tps65910_list_voltage_dcdc(dev, old_selector); + if (old_volt < 0) + return old_volt; + + new_volt = tps65910_list_voltage_dcdc(dev, new_selector); + if (new_volt < 0) + return new_volt; + + /* VDD1 and VDD2 are 12.5mV/us, VDDCTRL is 100mV/20us */ + switch (id) { + case TPS65910_REG_VDD1: + case TPS65910_REG_VDD2: + return DIV_ROUND_UP(abs(old_volt - new_volt), 12500); + case TPS65911_REG_VDDCTRL: + return DIV_ROUND_UP(abs(old_volt - new_volt), 5000); + } + return -EINVAL; +} + /* Regulator ops (except VRTC) */ static struct regulator_ops tps65910_ops_dcdc = { .is_enabled = tps65910_is_enabled, @@ -900,8 +918,9 @@ static struct regulator_ops tps65910_ops_dcdc = { .enable_time = tps65910_enable_time, .set_mode = tps65910_set_mode, .get_mode = tps65910_get_mode, - .get_voltage = tps65910_get_voltage_dcdc, + .get_voltage_sel = tps65910_get_voltage_dcdc_sel, .set_voltage_sel = tps65910_set_voltage_dcdc, + .set_voltage_time_sel = tps65910_set_voltage_dcdc_time_sel, .list_voltage = tps65910_list_voltage_dcdc, }; -- 1.7.1.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH V1 2/2] regulator: tps65910: Provide settling time for DCDC voltage change 2012-03-13 6:05 ` [PATCH V1 2/2] regulator: tps65910: Provide settling time for DCDC voltage change Laxman Dewangan @ 2012-03-13 23:23 ` Mark Brown 2012-03-14 7:38 ` Laxman Dewangan 0 siblings, 1 reply; 6+ messages in thread From: Mark Brown @ 2012-03-13 23:23 UTC (permalink / raw) To: Laxman Dewangan; +Cc: lrg, axel.lin, linux-kernel [-- Attachment #1: Type: text/plain, Size: 364 bytes --] On Tue, Mar 13, 2012 at 11:35:21AM +0530, Laxman Dewangan wrote: > Settling time is require when there is dcdc rail's voltage change. > Returning proper delay time for dcdc voltage change to settle down > the output voltage to new value. This one doesn't apply, can you check against current topic/drivers please? I suspect a collision with some of Axel's work. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V1 2/2] regulator: tps65910: Provide settling time for DCDC voltage change 2012-03-13 23:23 ` Mark Brown @ 2012-03-14 7:38 ` Laxman Dewangan 0 siblings, 0 replies; 6+ messages in thread From: Laxman Dewangan @ 2012-03-14 7:38 UTC (permalink / raw) To: Mark Brown; +Cc: lrg@ti.com, axel.lin@gmail.com, linux-kernel@vger.kernel.org On Wednesday 14 March 2012 04:53 AM, Mark Brown wrote: > * PGP Signed by an unknown key > > On Tue, Mar 13, 2012 at 11:35:21AM +0530, Laxman Dewangan wrote: >> Settling time is require when there is dcdc rail's voltage change. >> Returning proper delay time for dcdc voltage change to settle down >> the output voltage to new value. > This one doesn't apply, can you check against current topic/drivers > please? I suspect a collision with some of Axel's work. Oops, I should wait for Axel's change to be in next. I resend this patch after syncing my tree with your's tree topic/driver. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-14 7:43 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-03-13 6:05 [PATCH V1 0/2] Settling time for rails on/voltage change Laxman Dewangan 2012-03-13 6:05 ` [PATCH V1 1/2] regulator: tps65910: Provide settling time for enabling rails Laxman Dewangan 2012-03-13 23:22 ` Mark Brown 2012-03-13 6:05 ` [PATCH V1 2/2] regulator: tps65910: Provide settling time for DCDC voltage change Laxman Dewangan 2012-03-13 23:23 ` Mark Brown 2012-03-14 7:38 ` Laxman Dewangan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox