summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2016-05-20 12:07:29 -0700
committerFlorian Fainelli <f.fainelli@gmail.com>2016-06-16 13:40:47 -0700
commit62be424799edc734ea71ead9b6200951674f3484 (patch)
tree8c99d5343f049ad446458d49d38a24e2f5fa54f0
parent63087386c0429d663203c20e42b520d612326b2b (diff)
downloadblackbird-op-linux-62be424799edc734ea71ead9b6200951674f3484.tar.gz
blackbird-op-linux-62be424799edc734ea71ead9b6200951674f3484.zip
ARM: multi_v7_defconfig: Enable BCM7038 Watchdog
The BCM7038 watchdog is used by all Broadcom STB SoCs but is not needed for system reboot, we just turn it on as a module. Acked-by: Scott Branden <scott.branden@broadcom.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 95638b42c41f..bfa79b3bffa7 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -457,6 +457,7 @@ CONFIG_MESON_WATCHDOG=y
CONFIG_DW_WATCHDOG=y
CONFIG_DIGICOLOR_WATCHDOG=y
CONFIG_BCM2835_WDT=y
+CONFIG_BCM7038_WDT=m
CONFIG_MFD_AS3711=y
CONFIG_MFD_AS3722=y
CONFIG_MFD_ATMEL_FLEXCOM=y
OpenPOWER on IntegriCloud