Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / drivers / power / reset / Kconfig

diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 527a0f47ef448c1c39650a294eaadc3d9c2709ad..f65ff49bb27508ca72817877c91790df54b5a8a6 100644 (file)
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -40,7 +40,7 @@ config POWER_RESET_AXXIA
 
 config POWER_RESET_BRCMSTB
        bool "Broadcom STB reset driver" if COMPILE_TEST
-       depends on POWER_RESET && ARM
+       depends on ARM
        default ARCH_BRCMSTB
        help
          This driver provides restart support for ARM-based Broadcom STB
@@ -57,9 +57,17 @@ config POWER_RESET_GPIO
          If your board needs a GPIO high/low to power down, say Y and
          create a binding in your devicetree.
 
+config POWER_RESET_GPIO_RESTART
+       bool "GPIO restart driver"
+       depends on OF_GPIO
+       help
+         This driver supports restarting your board via a GPIO line.
+         If your board needs a GPIO high/low to restart, say Y and
+         create a binding in your devicetree.
+
 config POWER_RESET_HISI
        bool "Hisilicon power-off driver"
-       depends on POWER_RESET && ARCH_HISI
+       depends on ARCH_HISI
        help
          Reboot support for Hisilicon boards.
 
@@ -69,6 +77,13 @@ config POWER_RESET_MSM
        help
          Power off and restart support for Qualcomm boards.
 
+config POWER_RESET_LTC2952
+       bool "LTC2952 PowerPath power-off driver"
+       depends on OF_GPIO
+       help
+         This driver supports an external powerdown trigger and board power
+         down via the LTC2952. Bindings are made in the device tree.
+
 config POWER_RESET_QNAP
        bool "QNAP power-off driver"
        depends on OF_GPIO && PLAT_ORION
@@ -92,6 +107,12 @@ config POWER_RESET_SUN6I
        help
          Reboot support for the Allwinner A31 SoCs.
 
+config POWER_RESET_ST
+       bool "ST restart power-off driver"
+       depends on ARCH_STI
+       help
+         Power off and reset support for STMicroelectronics boards.
+
 config POWER_RESET_VERSATILE
        bool "ARM Versatile family reboot driver"
        depends on ARM
@@ -122,4 +143,12 @@ config POWER_RESET_KEYSTONE
        help
          Reboot support for the KEYSTONE SoCs.
 
+config POWER_RESET_SYSCON
+       bool "Generic SYSCON regmap reset driver"
+       depends on OF
+       select MFD_SYSCON
+       help
+         Reboot support for generic SYSCON mapped register reset.
+
 endif
+