summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commit7e856e5a97966fe89f6336783c0c676eb999e7cf (patch)
treeb5ea6efbf3f80d929729070d75c06b9a4cfe9eea /target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch
parent4eda974038a1d09f9a73973566f72ebfd4ce556a (diff)
downloadmtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch')
-rw-r--r--target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch b/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch
index 0090923..dd9f217 100644
--- a/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch
+++ b/target/linux/generic/patches-3.6/994-mpcore_wdt_fix_timer_mode_setup.patch
@@ -20,12 +20,12 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
+#define TWD_WDOG_CONTROL_TIMER_MODE (0 << 3)
+#define TWD_WDOG_CONTROL_WATCHDOG_MODE (1 << 3)
+
- struct clock_event_device;
+ #include <linux/ioport.h>
- extern void __iomem *twd_base;
+ struct twd_local_timer {
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
-@@ -118,18 +118,25 @@ static void mpcore_wdt_stop(struct mpcor
+@@ -121,18 +121,25 @@ static void mpcore_wdt_stop(struct mpcor
static void mpcore_wdt_start(struct mpcore_wdt *wdt)
{