diff options
| author | Guodong Xu <guodong.xu@linaro.org> | 2013-11-14 10:04:26 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-11-14 10:04:26 +0800 |
| commit | 3901699b2aee8edaeb590381c71088b7d86ca74c (patch) | |
| tree | 00d01a708cec256721a8af525201ea2563e5d44d | |
| parent | c594969767cd2bca8a291ffae430529a35acfed6 (diff) | |
| parent | 2e31c77b8d8312bd87cd1e21427a9a94dcf26eaa (diff) | |
Merge commit 'tracking-hilt-regulator-1113' into integration-hilt-lsk-androidintegration-hilt-lsk-android-1114
* commit 'tracking-hilt-regulator-1113':
regulator: hi6421: add supplier feature
| -rw-r--r-- | drivers/regulator/hi6421-regulator.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/hi6421-regulator.c b/drivers/regulator/hi6421-regulator.c index a48c9501030a..083e2c3d83ca 100644 --- a/drivers/regulator/hi6421-regulator.c +++ b/drivers/regulator/hi6421-regulator.c @@ -503,6 +503,9 @@ static int hi6421_regulator_probe(struct platform_device *pdev) rdesc = &sreg->rdesc; rdesc->name = sreg->name; rdesc->min_uV = initdata->constraints.min_uV; + if (of_get_property(np, "ldo-supply", NULL)) { + rdesc->supply_name = "ldo"; + } /* to parse device tree data for regulator specific */ ret = sreg->dt_parse(sreg, pdev); |