Merge commit 'AU_LINUX_ANDROID_ICS.04.00.04.00.126' into msm-3.4
AU_LINUX_ANDROID_ICS.04.00.04.00.126 from msm-3.0.
First parent is from google/android-3.4.
* commit 'AU_LINUX_ANDROID_ICS.04.00.04.00.126': (8712 commits)
PRNG: Device tree entry for qrng device.
vidc:1080p: Set video core timeout value for Thumbnail mode
msm: sps: improve the debugging support in SPS driver
board-8064 msm: Overlap secure and non secure video firmware heaps.
msm: clock: Add handoff ops for 7x30 and copper XO clocks
msm_fb: display: Wait for external vsync before DTV IOMMU unmap
msm: Fix ciruclar dependency in debug UART settings
msm: gdsc: Add GDSC regulator driver for msm-copper
defconfig: Enable Mobicore Driver.
mobicore: Add mobicore driver.
mobicore: rename variable to lower case.
mobicore: rename folder.
mobicore: add makefiles
mobicore: initial import of kernel driver
ASoC: msm: Add SLIMBUS_2_RX CPU DAI
board-8064-gpio: Update FUNC for EPM SPI CS
msm_fb: display: Remove chicken bit config during video playback
mmc: msm_sdcc: enable the sanitize capability
msm-fb: display: lm2 writeback support on mpq platfroms
msm_fb: display: Disable LVDS phy & pll during panel off
...
Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 36db5a4..2bbc796 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -366,5 +366,65 @@
This driver provides support for the voltage regulators on the
WM8994 CODEC.
-endif
+config REGULATOR_PMIC8058
+ tristate "PMIC8058 regulator driver"
+ depends on PMIC8058 && (ARCH_MSM8X60 || ARCH_FSM9XXX)
+ default y if PMIC8058 && (ARCH_MSM8X60 || ARCH_FSM9XXX)
+ help
+ Say Y here to support the voltage regulators on PMIC8058
+config REGULATOR_PMIC8901
+ tristate "PMIC8901 regulator driver"
+ depends on PMIC8901 && ARCH_MSM8X60
+ default y if PMIC8901 && ARCH_MSM8X60
+ help
+ Say Y here to support the voltage regulators on PMIC8901
+
+config REGULATOR_PM8XXX
+ tristate "Qualcomm PM8XXX PMIC Voltage regulators"
+ depends on MFD_PM8XXX
+ help
+ This driver supports voltage regulators in Qualcomm PM8XXX PMIC chips.
+ PM8XXX chips provide several different varieties of LDO and switching
+ regulators. They also provide negative charge pumps and voltage
+ switches.
+
+config REGULATOR_MSM_GPIO
+ tristate "MSM GPIO regulator"
+ depends on GPIOLIB
+ help
+ This driver provides a regulator wrapper around a GPIO pin that is set
+ to output. It is intended to be used for GPIO pins that provide the
+ enable signal to a physical regulator. The GPIO enable signal can
+ be configured to be active high (default) or active low.
+
+config REGULATOR_PM8058_XO
+ tristate "PM8058 XO Buffer driver"
+ depends on PMIC8058
+ default n
+ help
+ This driver supports xo buffer control in the Qualcomm PM8058 PMIC
+ chip. It is only supposed to be used when Linux on application
+ processor is the master in control of XO buffers.
+
+config REGULATOR_STUB
+ tristate "Stub Regulator"
+ help
+ This driver adds stub regulator support. The driver is absent of any
+ real hardware based implementation. It allows for clients to register
+ their regulator device constraints and use all of the standard
+ regulator interfaces. This is useful for bringing up new platforms
+ when the real hardware based implementation may not be yet available.
+ Clients can use the real regulator device names with proper
+ constraint checking while the real driver is being developed.
+
+config REGULATOR_QPNP
+ depends on OF_SPMI
+ depends on MSM_QPNP
+ tristate "Qualcomm QPNP regulator support"
+ help
+ This driver supports voltage regulators in Qualcomm PMIC chips which
+ comply with QPNP. QPNP is a SPMI based PMIC implementation. These
+ chips provide several different varieties of LDO and switching
+ regulators. They also provide voltage switches and boost regulators.
+endif