projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a95c630)
ARM: multi_v7_defconfig: add Atmel watchdog timers
authorNicolas Ferre <nicolas.ferre@atmel.com>
Tue, 26 Apr 2016 15:59:18 +0000 (17:59 +0200)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Wed, 27 Apr 2016 12:07:57 +0000 (14:07 +0200)
Add both Atmel watchdog timers to the multi_v7_defconfig. They are added
as part of the kernel because it's a core piece of the system.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/configs/multi_v7_defconfig patch | blob | history

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index af1e0c9..d72ee27 100644 (file)
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -430,6 +430,8 @@ CONFIG_WATCHDOG=y
 CONFIG_DA9063_WATCHDOG=m
 CONFIG_XILINX_WATCHDOG=y
 CONFIG_ARM_SP805_WATCHDOG=y
+CONFIG_AT91SAM9X_WATCHDOG=y
+CONFIG_SAMA5D4_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_ST_LPC_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
Domain: System / Kernel;