aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2016-07-28 09:32:36 -0400
committerPhilipp Zabel <p.zabel@pengutronix.de>2016-08-25 07:27:44 -0400
commit44336c24a931eb51feba6574bcf4d63c4bca432f (patch)
tree9b910e2f64bbfb86c652a200e32e67b04430f3ac
parentcd7f4b81cf927a0296b50b95862ef4f1b064ea27 (diff)
reset: meson: add driver Kconfig option
Visible only if COMPILE_TEST is enabled, this allows to include the driver in build tests. Acked-by: Neil Armstrong <narmstrong@baylibre.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 72c9b7846392..3fa6afe1e3fa 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -33,6 +33,12 @@ config RESET_LPC18XX
33 help 33 help
34 This enables the reset controller driver for NXP LPC18xx/43xx SoCs. 34 This enables the reset controller driver for NXP LPC18xx/43xx SoCs.
35 35
36config RESET_MESON
37 bool "Meson Reset Driver" if COMPILE_TEST
38 default ARCH_MESON
39 help
40 This enables the reset driver for Amlogic Meson SoCs.
41
36config RESET_OXNAS 42config RESET_OXNAS
37 bool 43 bool
38 44
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile
index 25aa05aba185..1408cba12119 100644
--- a/drivers/reset/Makefile
+++ b/drivers/reset/Makefile
@@ -1,7 +1,6 @@
1obj-y += core.o 1obj-y += core.o
2obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o 2obj-$(CONFIG_ARCH_SOCFPGA) += reset-socfpga.o
3obj-$(CONFIG_MACH_PISTACHIO) += reset-pistachio.o 3obj-$(CONFIG_MACH_PISTACHIO) += reset-pistachio.o
4obj-$(CONFIG_ARCH_MESON) += reset-meson.o
5obj-$(CONFIG_ARCH_STM32) += reset-stm32.o 4obj-$(CONFIG_ARCH_STM32) += reset-stm32.o
6obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o 5obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o
7obj-$(CONFIG_ARCH_STI) += sti/ 6obj-$(CONFIG_ARCH_STI) += sti/
@@ -10,6 +9,7 @@ obj-$(CONFIG_ARCH_ZYNQ) += reset-zynq.o
10obj-$(CONFIG_RESET_ATH79) += reset-ath79.o 9obj-$(CONFIG_RESET_ATH79) += reset-ath79.o
11obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o 10obj-$(CONFIG_RESET_BERLIN) += reset-berlin.o
12obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o 11obj-$(CONFIG_RESET_LPC18XX) += reset-lpc18xx.o
12obj-$(CONFIG_RESET_MESON) += reset-meson.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