commit 1bd1098d42952f840d5abbfaebcb305f3d67d5f1
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 06 10:31:18 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 06 10:31:18 2018 -0700
tree ad51b6f1cc8d9a14312ac5ec90aad1715a912fdf
parent 10a7bb691c880fac9d75c0838ae7aed64d7398df
parent ed819c8cfccf079742ac260848931e8693ef32ce

Merge "qca: fix kw issue"

board/qca/arm/ipq806x/ipq806x.c

diff --git a/board/qca/arm/ipq806x/ipq806x.c b/board/qca/arm/ipq806x/ipq806x.c
index bd90cf7..4939551 100644
--- a/board/qca/arm/ipq806x/ipq806x.c
+++ b/board/qca/arm/ipq806x/ipq806x.c
@@ -30,7 +30,6 @@
 #include "ipq806x.h"
 #include "qca_common.h"
 #include <asm/arch-qca-common/scm.h>
-#include <watchdog.h>
 
 #define DLOAD_MAGIC_COOKIE_1 0xE47B337D
 #define DLOAD_MAGIC_COOKIE_2 0x0501CAB0
@@ -186,13 +185,6 @@
 	while(1);
 }
 
-#ifdef CONFIG_HW_WATCHDOG
-void hw_watchdog_reset(void)
-{
-	writel(1, APCS_WDT0_RST);
-}
-#endif
-
 int board_mmc_init(bd_t *bis)
 {
 	int node, gpio_node;

include/configs/ipq806x.h

diff --git a/include/configs/ipq806x.h b/include/configs/ipq806x.h
index 52129cf..340053e 100644
--- a/include/configs/ipq806x.h
+++ b/include/configs/ipq806x.h
@@ -85,7 +85,7 @@
 
 #undef CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_HW_WATCHDOG
+#undef CONFIG_HW_WATCHDOG
 
 #define CONFIG_SYS_DEVICE_NULLDEV