[PATCH 1/2] regulator: Fix setting constraints->ramp_delay in of_get_regulation_constraints

[PATCH 1/2] regulator: Fix setting constraints->ramp_delay in of_get_regulation_constraints

[Axel Lin]

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/regulator/of_regulator.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index e2a7310..68dc3d4 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -63,7 +63,7 @@ static void of_get_regulation_constraints(struct device_node *np,
 
 	ramp_delay = of_get_property(np, "regulator-ramp-delay", NULL);
 	if (ramp_delay)
-		constraints->min_uV = be32_to_cpu(*ramp_delay);
+		constraints->ramp_delay = be32_to_cpu(*ramp_delay);
 }
 
 /**
-- 
1.7.9.5

[PATCH 2/2] regulator: core: Change the unit of ramp_delay from mV/uS to uV/uS

[Axel Lin]

This change makes it possible to set ramp_delay with 0.xxx mV/uS without
truncation issue.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
This patch is on top of the patch I sent earlier:
http://www.kernelhub.org/?msg=85659&p=2

Axel
 .../devicetree/bindings/regulator/regulator.txt    |    2 +-
 drivers/regulator/core.c                           |    4 ++--
 include/linux/regulator/driver.h                   |    2 +-
 include/linux/regulator/machine.h                  |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index d0a7b12..bec5d57 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -10,7 +10,7 @@ Optional properties:
 - regulator-always-on: boolean, regulator should never be disabled
 - regulator-boot-on: bootloader/firmware enabled regulator
 - <name>-supply: phandle to the parent supply/regulator node
-- regulator-ramp-delay: ramp delay for regulator(in mV/uS)
+- regulator-ramp-delay: ramp delay for regulator(in uV/uS)
 
 Example:
 
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index bf0306f..81a0ecf 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2328,11 +2328,11 @@ int regulator_set_voltage_time_sel(struct regulator_dev *rdev,
 	if (rdev->desc->uV_step) {
 		return DIV_ROUND_UP(rdev->desc->uV_step *
 				    abs(new_selector - old_selector),
-				    ramp_delay * 1000);
+				    ramp_delay);
 	} else if (rdev->desc->volt_table) {
 		return DIV_ROUND_UP(abs(rdev->desc->volt_table[new_selector] -
 					rdev->desc->volt_table[old_selector]),
-				    ramp_delay * 1000);
+				    ramp_delay);
 	} else {
 		rdev_warn(rdev, "Unsupported voltage mapping settings\n");
 	}
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index ddc155d..84f999ed 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -173,7 +173,7 @@ enum regulator_type {
  *
  * @min_uV: Voltage given by the lowest selector (if linear mapping)
  * @uV_step: Voltage increase with each selector (if linear mapping)
- * @ramp_delay: Time to settle down after voltage change (unit: mV/us)
+ * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
  * @volt_table: Voltage mapping table (if table based mapping)
  *
  * @vsel_reg: Register for selector when using regulator_regmap_X_voltage_
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 5f37ad3..40dd0a3 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -92,7 +92,7 @@ struct regulator_state {
  *                 mode.
  * @initial_state: Suspend state to set by default.
  * @initial_mode: Mode to set at startup.
- * @ramp_delay: Time to settle down after voltage change (unit: mV/us)
+ * @ramp_delay: Time to settle down after voltage change (unit: uV/us)
  */
 struct regulation_constraints {
 
-- 
1.7.9.5

Re: [PATCH 2/2] regulator: core: Change the unit of ramp_delay from mV/uS to uV/uS

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

On Mon, Jun 18, 2012 at 02:03:16PM +0800, Axel Lin wrote:

> This patch is on top of the patch I sent earlier:
> http://www.kernelhub.org/?msg=85659&p=2

Always provide something human readable (like the subject line) when
talking about patches - it's the same problem as the SHA1, it might go
bad in future and it means your mail isn't directly legible.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 1/2] regulator: Fix setting constraints->ramp_delay in of_get_regulation_constraints

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 128 bytes --]

On Mon, Jun 18, 2012 at 01:59:02PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Applied both, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]