Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[cascardo/linux.git] / drivers / reset / Kconfig

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 3fa6afe..06d9fa2 100644 (file)
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -42,6 +42,30 @@ config RESET_MESON
 config RESET_OXNAS
        bool
 
+config RESET_PISTACHIO
+       bool "Pistachio Reset Driver" if COMPILE_TEST
+       default MACH_PISTACHIO
+       help
+         This enables the reset driver for ImgTec Pistachio SoCs.
+
+config RESET_SOCFPGA
+       bool "SoCFPGA Reset Driver" if COMPILE_TEST
+       default ARCH_SOCFPGA
+       help
+         This enables the reset controller driver for Altera SoCFPGAs.
+
+config RESET_STM32
+       bool "STM32 Reset Driver" if COMPILE_TEST
+       default ARCH_STM32
+       help
+         This enables the RCC reset controller driver for STM32 MCUs.
+
+config RESET_SUNXI
+       bool "Allwinner SoCs Reset Driver" if COMPILE_TEST && !ARCH_SUNXI
+       default ARCH_SUNXI
+       help
+         This enables the reset driver for Allwinner SoCs.
+
 config TI_SYSCON_RESET
        tristate "TI SYSCON Reset Driver"
        depends on HAS_IOMEM
@@ -62,6 +86,12 @@ config RESET_UNIPHIER
          Say Y if you want to control reset signals provided by System Control
          block, Media I/O block, Peripheral Block.
 
+config RESET_ZYNQ
+       bool "ZYNQ Reset Driver" if COMPILE_TEST
+       default ARCH_ZYNQ
+       help
+         This enables the reset controller driver for Xilinx Zynq SoCs.
+
 source "drivers/reset/sti/Kconfig"
 source "drivers/reset/hisilicon/Kconfig"