summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Kconfig
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-03-12 13:07:27 +0100
committerNicolas Ferre <nicolas.ferre@atmel.com>2015-03-16 17:03:01 +0100
commit8432f9e5e82a13b82a76171c89b0858e855c9da5 (patch)
tree1bbae26117476b5f464e6d79c6b1c740d7b7a0cc /drivers/watchdog/Kconfig
parent1aa15f4e00c9be2c7e4c3bd36886ed65d25cc075 (diff)
downloadlinux-stable-8432f9e5e82a13b82a76171c89b0858e855c9da5.tar.gz
linux-stable-8432f9e5e82a13b82a76171c89b0858e855c9da5.tar.bz2
linux-stable-8432f9e5e82a13b82a76171c89b0858e855c9da5.zip
watchdog: at91rm9200: use the system timer syscon
Use a syscon regmap to access the system timer registers. Also, rename the driver atmel_st_watchdog to stop conflicting with at91sam9_wdt.c Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r--drivers/watchdog/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 16f202350997..ce4f3a7f95fd 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -154,7 +154,7 @@ config ARM_SP805_WATCHDOG
config AT91RM9200_WATCHDOG
tristate "AT91RM9200 watchdog"
- depends on SOC_AT91RM9200
+ depends on SOC_AT91RM9200 && MFD_SYSCON
help
Watchdog timer embedded into AT91RM9200 chips. This will reboot your
system when the timeout is reached.