aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2016-07-28 09:31:12 -0400
committerPhilipp Zabel <p.zabel@pengutronix.de>2016-08-25 07:27:42 -0400
commit70d467ea16c7bc1c21ccde69e01fa41a1b3b9df7 (patch)
treed7ae5618effc3d38a54e8358bf7f55e29e1a4b9f
parente27b4a6e634735b730cdae7b9d852a000c06cadd (diff)
reset: berlin: add driver Kconfig option
Visible only if COMPILE_TEST is enabled, this allows to include the driver in build tests. Cc: Antoine Tenart <antoine.tenart@free-electrons.com> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r--drivers/reset/Kconfig6
-rw-r--r--drivers/reset/Makefile2
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 9da05073f5e3..1194cbe9b257 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -21,6 +21,12 @@ config RESET_ATH79
21 This enables the ATH79 reset controller driver that supports the 21 This enables the ATH79 reset controller driver that supports the
22 AR71xx SoC reset controller. 22 AR71xx SoC reset controller.
23 23
24config RESET_BERLIN
25 bool "Berlin Reset Driver" if COMPILE_TEST
26 default ARCH_BERLIN
27 help
28 This enables the reset controller driver for Marvell Berlin SoCs.
29
24config RESET_OXNAS 30config RESET_OXNAS
25 bool 31 bool
26 32
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index e3fc337d55a9..34c0b2320e5e 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,7 +1,6 @@
1obj-y += core.o 1obj-y += core.o
2obj-$(CONFIG_ARCH_LPC18XX) += reset-lpc18xx.o 2obj-$(CONFIG_ARCH_LPC18XX) += reset-lpc18xx.o
3obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o 3obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o
4obj-$(CONFIG_ARCH_BERLIN) += reset-berlin.o
5obj-$(CONFIG_MACH_PISTACHIO) += reset-pistachio.o 4obj-$(CONFIG_MACH_PISTACHIO) += reset-pistachio.o
6obj-$(CONFIG_ARCH_MESON) += reset-meson.o 5obj-$(CONFIG_ARCH_MESON) += reset-meson.o
7obj-$(CONFIG_ARCH_STM32) += reset-stm32.o 6obj-$(CONFIG_ARCH_STM32) += reset-stm32.o
@@ -10,6 +9,7 @@ obj-$(CONFIG_ARCH_STI) += sti/
10obj-$(CONFIG_ARCH_HISI) += hisilicon/ 9obj-$(CONFIG_ARCH_HISI) += hisilicon/
11obj-$(CONFIG_ARCH_ZYNQ) += reset-zynq.o 10obj-$(CONFIG_ARCH_ZYNQ) += reset-zynq.o
12obj-$(CONFIG_RESET_ATH79) += reset-ath79.o 11obj-$(CONFIG_RESET_ATH79) += reset-ath79.o
12obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o
13obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o 13obj-$(CONFIG_RESET_OXNAS) += reset-oxnas.o
14obj-$(CONFIG_TI_SYSCON_RESET) += reset-ti-syscon.o 14obj-$(CONFIG_TI_SYSCON_RESET) += reset-ti-syscon.o
15obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o 15obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o