iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: Make bulk API support optional supplies

Browse Source 
Make it possible to use the bulk API with optional supplies, by allowing
the consumer to marking supplies as optional in the regulator_bulk_data.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bjorn Andersson
2015-11-09 22:20:37 -08:00
committed by Mark Brown
parent 8005c49d9a
commit 3ff3f518a1
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/core.c
View File

@ -3451,8 +3451,10 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
consumers[i].consumer = NULL; consumers[i].consumer = NULL;
for (i = 0; i < num_consumers; i++) { for (i = 0; i < num_consumers; i++) {
consumers[i].consumer = regulator_get(dev, consumers[i].consumer = _regulator_get(dev,
consumers[i].supply); consumers[i].supply,
false,
!consumers[i].optional);
if (IS_ERR(consumers[i].consumer)) { if (IS_ERR(consumers[i].consumer)) {
ret = PTR_ERR(consumers[i].consumer); ret = PTR_ERR(consumers[i].consumer);
dev_err(dev, "Failed to get supply '%s': %d\n", dev_err(dev, "Failed to get supply '%s': %d\n",

7
drivers/regulator/devres.c
View File

@ -164,8 +164,11 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers,
consumers[i].consumer = NULL; consumers[i].consumer = NULL;
for (i = 0; i < num_consumers; i++) { for (i = 0; i < num_consumers; i++) {
consumers[i].consumer = devm_regulator_get(dev, consumers[i].consumer = _devm_regulator_get(dev,
consumers[i].supply); consumers[i].supply,
consumers[i].optional ?
OPTIONAL_GET :
NORMAL_GET);
if (IS_ERR(consumers[i].consumer)) { if (IS_ERR(consumers[i].consumer)) {
ret = PTR_ERR(consumers[i].consumer); ret = PTR_ERR(consumers[i].consumer);
dev_err(dev, "Failed to get supply '%s': %d\n", dev_err(dev, "Failed to get supply '%s': %d\n",

3
include/linux/regulator/consumer.h
View File

@ -140,6 +140,8 @@ struct regulator;
* *
* @supply: The name of the supply. Initialised by the user before * @supply: The name of the supply. Initialised by the user before
* using the bulk regulator APIs. * using the bulk regulator APIs.
* @optional: The supply should be considered optional. Initialised by the user
* before using the bulk regulator APIs.
* @consumer: The regulator consumer for the supply. This will be managed * @consumer: The regulator consumer for the supply. This will be managed
* by the bulk API. * by the bulk API.
* *
@ -149,6 +151,7 @@ struct regulator;
*/ */
struct regulator_bulk_data { struct regulator_bulk_data {
const char *supply; const char *supply;
bool optional;
struct regulator *consumer; struct regulator *consumer;
/* private: Internal use */ /* private: Internal use */