video: rockchip: vpu: clear mmu status when vpu reset

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / Kconfig

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 06850e7366db5f7aa3eb93b8f4c1bbe74f42c226..f9dde4d26ea234a298c7728bbb7c38b38dbb1e01 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -574,11 +574,11 @@ config REGULATOR_RC5T583
          outputs which can be controlled by i2c communication.
 
 config REGULATOR_RK808
-       tristate "Rockchip RK808 Power regulators"
+       tristate "Rockchip RK808/RK818 Power regulators"
        depends on MFD_RK808
        help
          Select this option to enable the power regulator of ROCKCHIP
-         PMIC RK808.
+         PMIC RK808 and RK818.
          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.
@@ -819,5 +819,11 @@ config REGULATOR_WM8994
          This driver provides support for the voltage regulators on the
          WM8994 CODEC.
 
+config REGULATOR_XZ3216
+       tristate "Xizhuo XZ3216 voltage regulator"
+       depends on I2C
+       help
+         Support the voltage and current regulators of the XZ321X series of DCDC devices.
+
 endif