diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2012-01-02 13:08:45 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-01-06 17:09:13 +0530 |
| commit | 18e131ef2f547115dd0c90c058917c865167364c (patch) | |
| tree | e0efa290342bd1c5bf42a11ab717b617848e8faa /drivers | |
| parent | ad3ad6b37fe8ced2caaed3d18a87a3f8206608d4 (diff) | |
regulator: Enable supply regulator if child rail is enabled.
During regulator_register, the rail is set on the provided
machine constraints and if it is enabled then it is also
require to enable the supply regulator. This will make sure
that:
1. Proper reference count for supply regulator to be maintain.
2. Supply regulator should be enable when given rail is enabled.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cherry-picked from linus' mainline:
b2296bd43e781976743354c668a356b0df98e1da
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Change-Id: Ibfdcc8e8dc04a109905883239a7f358a1ef9d54d
Reviewed-on: http://git-master/r/73176
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f3247f7ccefc..79d670c913e2 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2690,6 +2690,14 @@ struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, ret = set_supply(rdev, r); if (ret < 0) goto scrub; + + /* Enable supply if rail is enabled */ + if (rdev->desc->ops->is_enabled && + rdev->desc->ops->is_enabled(rdev)) { + ret = regulator_enable(rdev->supply); + if (ret < 0) + goto scrub; + } } /* add consumers devices */ |