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

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

diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 3b451e162a983ff2a251acdaef2f451ebf8c4703..f65ff49bb27508ca72817877c91790df54b5a8a6 100644 (file)
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -6,15 +6,33 @@ menuconfig POWER_RESET
 
          Say Y here to enable board reset and power off
 
+if POWER_RESET
+
 config POWER_RESET_AS3722
        bool "ams AS3722 power-off driver"
-       depends on MFD_AS3722 && POWER_RESET
+       depends on MFD_AS3722
        help
          This driver supports turning off board via a ams AS3722 power-off.
 
+config POWER_RESET_AT91_POWEROFF
+       bool "Atmel AT91 poweroff driver"
+       depends on ARCH_AT91
+       default SOC_AT91SAM9 || SOC_SAMA5
+       help
+         This driver supports poweroff for Atmel AT91SAM9 and SAMA5
+         SoCs
+
+config POWER_RESET_AT91_RESET
+       bool "Atmel AT91 reset driver"
+       depends on ARCH_AT91
+       default SOC_AT91SAM9 || SOC_SAMA5
+       help
+         This driver supports restart for Atmel AT91SAM9 and SAMA5
+         SoCs
+
 config POWER_RESET_AXXIA
        bool "LSI Axxia reset driver"
-       depends on POWER_RESET && ARCH_AXXIA
+       depends on ARCH_AXXIA
        help
          This driver supports restart for Axxia SoC.
 
@@ -22,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
@@ -33,7 +51,7 @@ config POWER_RESET_BRCMSTB
 
 config POWER_RESET_GPIO
        bool "GPIO power-off driver"
-       depends on OF_GPIO && POWER_RESET
+       depends on OF_GPIO
        help
          This driver supports turning off your board via a GPIO line.
          If your board needs a GPIO high/low to power down, say Y and
@@ -41,7 +59,7 @@ config POWER_RESET_GPIO
 
 config POWER_RESET_GPIO_RESTART
        bool "GPIO restart driver"
-       depends on OF_GPIO && POWER_RESET
+       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
@@ -49,26 +67,26 @@ config POWER_RESET_GPIO_RESTART
 
 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.
 
 config POWER_RESET_MSM
        bool "Qualcomm MSM power-off driver"
-       depends on POWER_RESET && ARCH_QCOM
+       depends on ARCH_QCOM
        help
          Power off and restart support for Qualcomm boards.
 
 config POWER_RESET_LTC2952
        bool "LTC2952 PowerPath power-off driver"
-       depends on OF_GPIO && POWER_RESET
+       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 && POWER_RESET && PLAT_ORION
+       depends on OF_GPIO && PLAT_ORION
        help
          This driver supports turning off QNAP NAS devices by sending
          commands to the microcontroller which controls the main power.
@@ -86,20 +104,28 @@ config POWER_RESET_RESTART
 config POWER_RESET_SUN6I
        bool "Allwinner A31 SoC reset driver"
        depends on ARCH_SUNXI
-       depends on POWER_RESET
        help
          Reboot support for the Allwinner A31 SoCs.
 
 config POWER_RESET_ST
        bool "ST restart power-off driver"
-       depends on POWER_RESET && ARCH_STI
+       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
+       depends on MFD_SYSCON
+       depends on OF
+       help
+         Power off and restart support for ARM Versatile family of
+         reference boards.
+
 config POWER_RESET_VEXPRESS
        bool "ARM Versatile Express power-off and reset driver"
        depends on ARM || ARM64
-       depends on POWER_RESET && VEXPRESS_CONFIG
+       depends on VEXPRESS_CONFIG
        help
          Power off and reset support for the ARM Ltd. Versatile
          Express boards.
@@ -107,7 +133,6 @@ config POWER_RESET_VEXPRESS
 config POWER_RESET_XGENE
        bool "APM SoC X-Gene reset driver"
        depends on ARM64
-       depends on POWER_RESET
        help
          Reboot support for the APM SoC X-Gene Eval boards.
 
@@ -120,7 +145,10 @@ config POWER_RESET_KEYSTONE
 
 config POWER_RESET_SYSCON
        bool "Generic SYSCON regmap reset driver"
-       depends on POWER_RESET && OF
+       depends on OF
        select MFD_SYSCON
        help
          Reboot support for generic SYSCON mapped register reset.
+
+endif
+