xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'regulator-5.0' into regulator-5.1 stpmic1 const/range

Browse Source
This commit is contained in:
Mark Brown
2019-02-19 11:06:41 +00:00
parent e6fff62ab8 48593a99a1
commit 16646d8d3d
13 changed files with 152 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/lochnagar-regulator.c
View File

@@ -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",