diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-19 12:06:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-19 12:06:41 +0100 |
| commit | 16646d8d3d66e0a89528f72a28a23023b054417d (patch) | |
| tree | 6620abf1d2021486f30e7036324e4de6f0b14321 /drivers/regulator/lochnagar-regulator.c | |
| parent | regulator: stpmic1: Add active discharge support (diff) | |
| parent | regulator: stpmic1: Change buck1 voltage range (diff) | |
| download | linux-16646d8d3d66e0a89528f72a28a23023b054417d.tar.xz linux-16646d8d3d66e0a89528f72a28a23023b054417d.zip | |
Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range
Diffstat (limited to 'drivers/regulator/lochnagar-regulator.c')
| -rw-r--r-- | drivers/regulator/lochnagar-regulator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/lochnagar-regulator.c b/drivers/regulator/lochnagar-regulator.c index 2c0743e65eaf..ff97cc50f2eb 100644 --- a/drivers/regulator/lochnagar-regulator.c +++ b/drivers/regulator/lochnagar-regulator.c @@ -194,7 +194,7 @@ static const struct regulator_desc lochnagar_regulators[] = { .name = "VDDCORE", .supply_name = "SYSVDD", .type = REGULATOR_VOLTAGE, - .n_voltages = 57, + .n_voltages = 66, .ops = &lochnagar_vddcore_ops, .id = LOCHNAGAR_VDDCORE, @@ -226,7 +226,7 @@ static const struct of_device_id lochnagar_of_match[] = { }, { .compatible = "cirrus,lochnagar2-mic2vdd", - .data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD], + .data = &lochnagar_regulators[LOCHNAGAR_MIC2VDD], }, { .compatible = "cirrus,lochnagar2-vddcore", |