From: Mark Brown Date: Tue, 30 Sep 2014 12:50:30 +0000 (+0100) Subject: Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rn5t618... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6d9deb7ad4559c9361701e9df7ccf1fb0be02cf9;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rn5t618' and 'regulator/topic/samsung' into regulator-next --- 6d9deb7ad4559c9361701e9df7ccf1fb0be02cf9 diff --cc drivers/regulator/Kconfig index 58a6ec125327,fb32babf756e,ac0e6437b7b5,2dc8289e5dba..55d7b7b0f2e0 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@@@@ -505,6 -459,16 -459,22 -459,6 +505,22 @@@@@ config REGULATOR_RC5T58 through regulator interface. The device supports multiple DCDC/LDO outputs which can be controlled by i2c communication. + +config REGULATOR_RK808 + + tristate "Rockchip RK808 Power regulators" + + depends on MFD_RK808 + + help + + Select this option to enable the power regulator of ROCKCHIP + + PMIC RK808. + + This driver supports the control of different power rails of device + + through regulator interface. The device supports multiple DCDC/LDO + + outputs which can be controlled by i2c communication. + + ++ +config REGULATOR_RN5T618 ++ + tristate "Ricoh RN5T618 voltage regulators" ++ + depends on MFD_RN5T618 ++ + help ++ + Say y here to support the regulators found on Ricoh RN5T618 PMIC. ++ + config REGULATOR_S2MPA01 tristate "Samsung S2MPA01 voltage regulator" depends on MFD_SEC_CORE diff --cc drivers/regulator/Makefile index f0e227d4f5a5,236fdbb2b786,3b767c60d76b,aa4a6aa7b558..1029ed39c512 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@@@@ -67,6 -62,7 -62,8 -62,6 +67,8 @@@@@ obj-$(CONFIG_REGULATOR_PBIAS) += pbias- obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o + +obj-$(CONFIG_REGULATOR_RK808) += rk808-regulator.o ++ +obj-$(CONFIG_REGULATOR_RN5T618) += rn5t618-regulator.o obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o