aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-06-01 18:08:08 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-06-01 18:08:08 +0000
commitae3da8d5941caa9356b52f9661d900ef551d2cba (patch)
tree1b2525a5991385a54934ee0ff1e7d6edeb2fc344 /target/linux
parent154ebf9380422d4dd209e38e2d8e62d871b293e1 (diff)
downloadupstream-ae3da8d5941caa9356b52f9661d900ef551d2cba.tar.gz
upstream-ae3da8d5941caa9356b52f9661d900ef551d2cba.tar.bz2
upstream-ae3da8d5941caa9356b52f9661d900ef551d2cba.zip
register the watchdog on the wbd111
SVN-Revision: 16267
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/gemini/patches/002-wbd111_support.patch3
-rw-r--r--target/linux/gemini/patches/003-wbd111-static-flash-map.patch3
2 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/gemini/patches/002-wbd111_support.patch b/target/linux/gemini/patches/002-wbd111_support.patch
index 51b2db5196..059006d0d4 100644
--- a/target/linux/gemini/patches/002-wbd111_support.patch
+++ b/target/linux/gemini/patches/002-wbd111_support.patch
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/arch/arm/mach-gemini/board-wbd111.c
-@@ -0,0 +1,124 @@
+@@ -0,0 +1,125 @@
+/*
+ * Support for Wiliboard WBD-111
+ *
@@ -109,6 +109,7 @@
+{
+ gemini_gpio_init();
+ platform_register_uart();
++ platform_register_watchdog();
+ platform_register_pflash(SZ_8M, NULL, 0);
+ platform_device_register(&wbd111_leds_device);
+ platform_device_register(&wbd111_keys_device);
diff --git a/target/linux/gemini/patches/003-wbd111-static-flash-map.patch b/target/linux/gemini/patches/003-wbd111-static-flash-map.patch
index a226eb77f6..1b9debb62d 100644
--- a/target/linux/gemini/patches/003-wbd111-static-flash-map.patch
+++ b/target/linux/gemini/patches/003-wbd111-static-flash-map.patch
@@ -9,7 +9,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
-@@ -102,11 +104,50 @@ static struct sys_timer wbd111_timer = {
+@@ -102,12 +104,51 @@ static struct sys_timer wbd111_timer = {
.init = gemini_timer_init,
};
@@ -55,6 +55,7 @@
{
gemini_gpio_init();
platform_register_uart();
+ platform_register_watchdog();
- platform_register_pflash(SZ_8M, NULL, 0);
+ platform_register_pflash(SZ_8M, wbd111_partitions,
+ wbd111_num_partitions);