regulator: core: set current constraints while setting machine constraints
PATCH 1/1 regulator: core: set current constraints while setting machine constraints
Machine constraints is configured during regulator register. If current constraints are provided through machine constraints then it is observed that sometime the current configured on rail is out of range what machine constraint has.
Set the current constraints when setting machine constraints to make sure that rail's current is within the range of given machine constraints.
--- drivers/regulator/core.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-)
drivers/regulator/core.c +38 -0
@@ -904,6 +904,40 @@ static int machine_constraints_voltage(struct regulator_dev *rdev,return 0 ; } +static int machine_constraints_current (struct regulator_dev *rdev, +struct regulation_constraints *constraints) +{ +int current_uA; +int ret; + +if (!rdev->desc->ops->set_current_limit || + !rdev->desc->ops->get_current_limit) +return 0 ; + +if (!rdev->constraints->min_uA && !rdev->constraints->max_uA) +return 0 ; + +if (rdev->constraints->min_uA > rdev->constraints->max_uA) { +rdev_err (rdev,"Current constraint is invalid\n" ); +return -EINVAL ; + } + +/* Set regulator current in constraint range */ + current_uA = rdev->desc->ops->get_current_limit (rdev); +if (current_uA < rdev->constraints->min_uA || + current_uA > rdev->constraints->max_uA) { + ret = rdev->desc->ops->set_current_limit (rdev, + rdev->constraints->min_uA, + rdev->constraints->max_uA); +if (ret <0 ) { +rdev_err (rdev, +"Failed to set current constraint, %d\n" , ret); +return ret; + } + } +return 0 ; +} +/** * set_machine_constraints - sets regulator constraints * @rdev: regulator source
@@ -934,6 +968,10 @@ static int set_machine_constraints(struct regulator_dev *rdev,if (ret !=0 ) goto out; + ret =machine_constraints_current (rdev, rdev->constraints); +if (ret !=0 ) + goto out; +/* do we need to setup our suspend state */ if (rdev->constraints->initial_state) { ret =suspend_prepare (rdev, rdev->constraints->initial_state);
Signature · 1 line
1.7.1.1
Mark Brown
maintainerdrivers/regulator/core.c static int machine_constraints_voltage(struct regulator_dev *rdev, · line 916
Quoted 4 lines · Laxman Dewangan
drivers/regulator/core.c +4
-0+if (!rdev->desc->ops->set_current_limit || + !rdev->desc->ops->get_current_limit) +return 0 ; +
The indentation here is odd and we probably ought to complain if someone tries to set a current constarint on a regulator that doesn't support the operation, if only to avoid surprises later on when the limits don't take effect.
drivers/regulator/core.c static int machine_constraints_voltage(struct regulator_dev *rdev, · line 936
Quoted 11 lines
drivers/regulator/core.c +11
-0+ current_uA = rdev->desc->ops->get_current_limit (rdev); +if (current_uA < rdev->constraints->min_uA || + current_uA > rdev->constraints->max_uA) { + ret = rdev->desc->ops->set_current_limit (rdev, + rdev->constraints->min_uA, + rdev->constraints->max_uA); +if (ret <0 ) { +rdev_err (rdev, +"Failed to set current constraint, %d\n" , ret); +return ret; + }
Why is this conditional on the existing setting? Just apply the constraint.
Review
Quoted 2 lines
(quoted diff) +2
-0+ } + return 0;
Missing blank.