Merge remote-tracking branch 'regulator/for-5.14' into regulator-next

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/regulator/Kconfig
index 3e7a38525cb3f63cd75bb1b05705bbdbdaf25bb9,3a71b020ea1c026c7671d3e7a6b72935c8744524..24ce9a17ab4fe4710dc9007ff3642b8587010a09
--- 1/drivers/regulator/Kconfig
--- 2/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/core.c
Simple merge

diff --cc drivers/regulator/fan53880.c
index 1684faf82ed2598e8bd11f783e9afdbd82104252,d7e34e9188c7d64a98684f6200a3d2b2793d92a4..8f25930d2769b9bd7d2e57d17f2e32bdd2763268
--- 1/drivers/regulator/fan53880.c
--- 2/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,

diff --cc drivers/regulator/fixed.c
Simple merge

diff --cc drivers/regulator/hi6421v600-regulator.c
Simple merge

diff --cc drivers/regulator/mt6315-regulator.c
Simple merge

diff --cc drivers/regulator/mt6358-regulator.c
Simple merge