From: Mark Brown Date: Sun, 1 Sep 2013 12:50:11 +0000 (+0100) Subject: Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=099c60622417c25b5454061a54cedf5b5132650d;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next --- 099c60622417c25b5454061a54cedf5b5132650d diff --cc drivers/regulator/Kconfig index 4a5367e3b6c3,37f697dc4b4c..6845d7439c23 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@@ -64,18 -64,8 +64,18 @@@ config REGULATOR_USERSPACE_CONSUME If unsure, say no. +config REGULATOR_88PM800 + tristate "Marvell 88PM800 Power regulators" + depends on MFD_88PM800 + help + This driver supports Marvell 88PM800 voltage regulator chips. + It delivers digitally programmable output, + the voltage is programmed via I2C interface. + It's suitable to support PXA988 chips to control VCC_MAIN and + various voltages. + config REGULATOR_88PM8607 - bool "Marvell 88PM8607 Power regulators" + tristate "Marvell 88PM8607 Power regulators" depends on MFD_88PM860X=y help This driver supports 88PM8607 voltage regulator chips.