From: Mark Brown Date: Wed, 23 Jun 2021 15:56:31 +0000 (+0100) Subject: Merge remote-tracking branch 'regulator/for-5.14' into regulator-next X-Git-Tag: accepted/tizen/unified/20230118.172025~7011^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fb593cbd88cf4df01c096d4dc320f027dfa2560;p=platform%2Fkernel%2Flinux-rpi.git Merge remote-tracking branch 'regulator/for-5.14' into regulator-next --- 7fb593cbd88cf4df01c096d4dc320f027dfa2560 diff --cc drivers/regulator/Kconfig index 3e7a385,3a71b02..24ce9a1 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@@ -1030,8 -1037,28 +1037,28 @@@ config REGULATOR_RT503 RT5033 PMIC. The device supports multiple regulators like current source, LDO and Buck. + config REGULATOR_RT6160 + tristate "Richtek RT6160 BuckBoost voltage regulator" + depends on I2C + select REGMAP_I2C + help + This adds support for voltage regulator in Richtek RT6160. + This device automatically change voltage output mode from + Buck or Boost. The mode transistion depend on the input source voltage. + The wide output range is from 2025mV to 5200mV and can be used on most + common application scenario. + + config REGULATOR_RT6245 + tristate "Richtek RT6245 voltage regulator" + depends on I2C + select REGMAP_I2C + help + This adds supprot for Richtek RT6245 voltage regulator. + It can support up to 14A output current and adjustable output voltage + from 0.4375V to 1.3875V, per step 12.5mV. + config REGULATOR_RTMV20 - tristate "RTMV20 Laser Diode Regulator" + tristate "Richtek RTMV20 Laser Diode Regulator" depends on I2C select REGMAP_I2C help diff --cc drivers/regulator/fan53880.c index 1684faf,d7e34e9..8f25930 --- a/drivers/regulator/fan53880.c +++ b/drivers/regulator/fan53880.c @@@ -77,9 -76,8 +77,9 @@@ static const struct regulator_desc fan5 REGULATOR_LINEAR_RANGE(600000, 0x1f, 0xf7, 12500), }, .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,