From: Mark Brown Date: Wed, 2 Jun 2021 16:13:06 +0000 (+0100) Subject: Merge remote-tracking branch 'regulator/for-5.14' into regulator-next X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=88a0f637b67bf8e05971b5baebfe550c37b8d413;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'regulator/for-5.14' into regulator-next --- 88a0f637b67bf8e05971b5baebfe550c37b8d413 diff --cc drivers/regulator/Kconfig index 3e7a38525cb3f,50c608e6d0065..118591b719c57 --- a/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