浏览代码

power: reset: Add if statement instead of multiple depends on

All the config option so far are depending on the POWER_RESET symbol

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Maxime Ripard 11 年之前
父节点
当前提交
6ca4f46005
共有 1 个文件被更改,包括 9 次插入8 次删除
  1. 9 8
      drivers/power/reset/Kconfig

+ 9 - 8
drivers/power/reset/Kconfig

@@ -6,15 +6,17 @@ menuconfig POWER_RESET
 
 
 	  Say Y here to enable board reset and power off
 	  Say Y here to enable board reset and power off
 
 
+if POWER_RESET
+
 config POWER_RESET_AS3722
 config POWER_RESET_AS3722
 	bool "ams AS3722 power-off driver"
 	bool "ams AS3722 power-off driver"
-	depends on MFD_AS3722 && POWER_RESET
+	depends on MFD_AS3722
 	help
 	help
 	  This driver supports turning off board via a ams AS3722 power-off.
 	  This driver supports turning off board via a ams AS3722 power-off.
 
 
 config POWER_RESET_AXXIA
 config POWER_RESET_AXXIA
 	bool "LSI Axxia reset driver"
 	bool "LSI Axxia reset driver"
-	depends on POWER_RESET && ARCH_AXXIA
+	depends on ARCH_AXXIA
 	help
 	help
 	  This driver supports restart for Axxia SoC.
 	  This driver supports restart for Axxia SoC.
 
 
@@ -22,7 +24,7 @@ config POWER_RESET_AXXIA
 
 
 config POWER_RESET_GPIO
 config POWER_RESET_GPIO
 	bool "GPIO power-off driver"
 	bool "GPIO power-off driver"
-	depends on OF_GPIO && POWER_RESET
+	depends on OF_GPIO
 	help
 	help
 	  This driver supports turning off your board via a GPIO line.
 	  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
 	  If your board needs a GPIO high/low to power down, say Y and
@@ -30,13 +32,13 @@ config POWER_RESET_GPIO
 
 
 config POWER_RESET_MSM
 config POWER_RESET_MSM
 	bool "Qualcomm MSM power-off driver"
 	bool "Qualcomm MSM power-off driver"
-	depends on POWER_RESET && ARCH_QCOM
+	depends on ARCH_QCOM
 	help
 	help
 	  Power off and restart support for Qualcomm boards.
 	  Power off and restart support for Qualcomm boards.
 
 
 config POWER_RESET_QNAP
 config POWER_RESET_QNAP
 	bool "QNAP power-off driver"
 	bool "QNAP power-off driver"
-	depends on OF_GPIO && POWER_RESET && PLAT_ORION
+	depends on OF_GPIO && PLAT_ORION
 	help
 	help
 	  This driver supports turning off QNAP NAS devices by sending
 	  This driver supports turning off QNAP NAS devices by sending
 	  commands to the microcontroller which controls the main power.
 	  commands to the microcontroller which controls the main power.
@@ -54,14 +56,13 @@ config POWER_RESET_RESTART
 config POWER_RESET_SUN6I
 config POWER_RESET_SUN6I
 	bool "Allwinner A31 SoC reset driver"
 	bool "Allwinner A31 SoC reset driver"
 	depends on ARCH_SUNXI
 	depends on ARCH_SUNXI
-	depends on POWER_RESET
 	help
 	help
 	  Reboot support for the Allwinner A31 SoCs.
 	  Reboot support for the Allwinner A31 SoCs.
 
 
 config POWER_RESET_VEXPRESS
 config POWER_RESET_VEXPRESS
 	bool "ARM Versatile Express power-off and reset driver"
 	bool "ARM Versatile Express power-off and reset driver"
 	depends on ARM || ARM64
 	depends on ARM || ARM64
-	depends on POWER_RESET && VEXPRESS_CONFIG
+	depends on VEXPRESS_CONFIG
 	help
 	help
 	  Power off and reset support for the ARM Ltd. Versatile
 	  Power off and reset support for the ARM Ltd. Versatile
 	  Express boards.
 	  Express boards.
@@ -69,7 +70,6 @@ config POWER_RESET_VEXPRESS
 config POWER_RESET_XGENE
 config POWER_RESET_XGENE
 	bool "APM SoC X-Gene reset driver"
 	bool "APM SoC X-Gene reset driver"
 	depends on ARM64
 	depends on ARM64
-	depends on POWER_RESET
 	help
 	help
 	  Reboot support for the APM SoC X-Gene Eval boards.
 	  Reboot support for the APM SoC X-Gene Eval boards.
 
 
@@ -80,3 +80,4 @@ config POWER_RESET_KEYSTONE
 	help
 	help
 	  Reboot support for the KEYSTONE SoCs.
 	  Reboot support for the KEYSTONE SoCs.
 
 
+endif