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

diff --cc drivers/regulator/Kconfig
index 3e7a38525cb3f63cd75bb1b05705bbdbdaf25bb9,50c608e6d0065b3dbd8fd894cf6074e34497a7bf..118591b719c570256227e3f08d7ae4d8dbf2e21a
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -1030,8 -1020,19 +1020,19 @@@ 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_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
Simple merge

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

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