diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-23 16:56:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-23 16:56:31 +0100 |
| commit | 7fb593cbd88cf4df01c096d4dc320f027dfa2560 (patch) | |
| tree | 1970f6b62728d95ab52de9813bfcf66cd59a48b5 /drivers/regulator/fan53880.c | |
| parent | ebad413c3cb04d60bb6b5f2ec4009af52a8761cb (diff) | |
| parent | ddf275b219ab22bc07c14ac88c290694089dced0 (diff) | |
| download | linux-7fb593cbd88cf4df01c096d4dc320f027dfa2560.tar.gz linux-7fb593cbd88cf4df01c096d4dc320f027dfa2560.tar.bz2 linux-7fb593cbd88cf4df01c096d4dc320f027dfa2560.zip | |
Merge remote-tracking branch 'regulator/for-5.14' into regulator-next
Diffstat (limited to 'drivers/regulator/fan53880.c')
| -rw-r--r-- | drivers/regulator/fan53880.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/regulator/fan53880.c b/drivers/regulator/fan53880.c index 1684faf82ed2..8f25930d2769 100644 --- a/drivers/regulator/fan53880.c +++ b/drivers/regulator/fan53880.c @@ -79,7 +79,7 @@ static const struct regulator_desc fan53880_regulators[] = { .n_linear_ranges = 2, .n_voltages = 0xf8, .vsel_reg = FAN53880_BUCKVOUT, - .vsel_mask = 0x7f, + .vsel_mask = 0xff, .enable_reg = FAN53880_ENABLE, .enable_mask = 0x10, .enable_time = 480, @@ -114,8 +114,7 @@ static const struct regmap_config fan53880_regmap = { .max_register = FAN53880_ENABLE_BOOST, }; -static int fan53880_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) +static int fan53880_i2c_probe(struct i2c_client *i2c) { struct regulator_config config = { }; struct regulator_dev *rdev; @@ -177,7 +176,7 @@ static struct i2c_driver fan53880_regulator_driver = { .name = "fan53880", .of_match_table = of_match_ptr(fan53880_dt_ids), }, - .probe = fan53880_i2c_probe, + .probe_new = fan53880_i2c_probe, .id_table = fan53880_i2c_id, }; module_i2c_driver(fan53880_regulator_driver); |