aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2007-12-13 19:20:12 +0000
committerJohn Crispin <john@openwrt.org>2007-12-13 19:20:12 +0000
commit82f0d7266445350be4180a81ec7ff3ab96a730f1 (patch)
treebebbb573c5ca709fc1978aa00ba2ff14da303fde
parent7d9713b97f2dacfcb8512a3c077f519ddf8f5e6f (diff)
downloadupstream-82f0d7266445350be4180a81ec7ff3ab96a730f1.tar.gz
upstream-82f0d7266445350be4180a81ec7ff3ab96a730f1.tar.bz2
upstream-82f0d7266445350be4180a81ec7ff3ab96a730f1.zip
initial merge of danube wdt code
SVN-Revision: 9727
-rw-r--r--target/linux/danube/config-2.6.231
-rw-r--r--target/linux/danube/files/arch/mips/danube/Kconfig4
-rw-r--r--target/linux/danube/files/drivers/char/watchdog/danube_wdt.c361
-rw-r--r--target/linux/danube/files/include/asm-mips/danube/danube.h19
-rw-r--r--target/linux/danube/files/include/asm-mips/danube/danube_wdt.h48
-rw-r--r--target/linux/danube/patches/110-drivers.patch32
6 files changed, 455 insertions, 10 deletions
diff --git a/target/linux/danube/config-2.6.23 b/target/linux/danube/config-2.6.23
index e286cff618..f575f6f13e 100644
--- a/target/linux/danube/config-2.6.23
+++ b/target/linux/danube/config-2.6.23
@@ -183,3 +183,4 @@ CONFIG_TRAD_SIGNALS=y
# CONFIG_VGASTATE is not set
# CONFIG_VIA_RHINE is not set
CONFIG_ZONE_DMA_FLAG=0
+CONFIG_DANUBE_WDT=y
diff --git a/target/linux/danube/files/arch/mips/danube/Kconfig b/target/linux/danube/files/arch/mips/danube/Kconfig
index 95b7f6fee0..135b640b40 100644
--- a/target/linux/danube/files/arch/mips/danube/Kconfig
+++ b/target/linux/danube/files/arch/mips/danube/Kconfig
@@ -12,5 +12,9 @@ config MTD_DANUBE
bool "Danube flash map"
default y
+config DANUBE_WDT
+ bool "Danube watchdog"
+ default y
+
endmenu
diff --git a/target/linux/danube/files/drivers/char/watchdog/danube_wdt.c b/target/linux/danube/files/drivers/char/watchdog/danube_wdt.c
new file mode 100644
index 0000000000..036a4ece49
--- /dev/null
+++ b/target/linux/danube/files/drivers/char/watchdog/danube_wdt.c
@@ -0,0 +1,361 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright (C) 2006 infineon
+ * Copyright (C) 2007 John Crispin <blogic@openwrt.org>
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/timer.h>
+#include <linux/fs.h>
+#include <linux/errno.h>
+#include <linux/proc_fs.h>
+#include <linux/stat.h>
+#include <linux/tty.h>
+#include <linux/selection.h>
+#include <linux/kmod.h>
+#include <linux/vmalloc.h>
+#include <linux/kdev_t.h>
+#include <linux/ioctl.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+#include <asm-mips/danube/danube_wdt.h>
+#include <asm-mips/danube/danube.h>
+
+extern unsigned int danube_get_fpi_hz (void);
+
+static int danube_wdt_inuse = 0;
+static int danube_wdt_major = 0;
+
+int
+danube_wdt_enable (unsigned int timeout)
+{
+ unsigned int wdt_cr = 0;
+ unsigned int wdt_reload = 0;
+ unsigned int wdt_clkdiv, clkdiv, wdt_pwl, pwl, ffpi;
+
+ /* clock divider & prewarning limit */
+ switch (clkdiv = DANUBE_BIU_WDT_CR_CLKDIV_GET(readl(DANUBE_BIU_WDT_CR)))
+ {
+ case 0:
+ wdt_clkdiv = 1;
+ break;
+ case 1:
+ wdt_clkdiv = 64;
+ break;
+ case 2:
+ wdt_clkdiv = 4096;
+ break;
+ case 3:
+ wdt_clkdiv = 262144;
+ break;
+ }
+
+ switch (pwl = DANUBE_BIU_WDT_CR_PWL_GET (readl(DANUBE_BIU_WDT_CR)))
+ {
+ case 0:
+ wdt_pwl = 0x8000;
+ break;
+ case 1:
+ wdt_pwl = 0x4000;
+ break;
+ case 2:
+ wdt_pwl = 0x2000;
+ break;
+ case 3:
+ wdt_pwl = 0x1000;
+ break;
+ }
+
+ //TODO
+ printk("WARNING FUNCTION CALL MISSING!!!");
+ //ffpi = cgu_get_io_region_clock();
+ printk("cpu clock = %d\n", ffpi);
+
+ /* caculate reload value */
+ wdt_reload = (timeout * (ffpi / wdt_clkdiv)) + wdt_pwl;
+
+ printk("wdt_pwl=0x%x, wdt_clkdiv=%d, ffpi=%d, wdt_reload = 0x%x\n",
+ wdt_pwl, wdt_clkdiv, ffpi, wdt_reload);
+
+ if (wdt_reload > 0xFFFF) {
+ printk ("timeout too large %d\n", timeout);
+ return -EINVAL;
+ }
+
+ /* Write first part of password access */
+ *DANUBE_BIU_WDT_CR = DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW1);
+
+ wdt_cr = *DANUBE_BIU_WDT_CR;
+ wdt_cr &= (!DANUBE_BIU_WDT_CR_PW_SET (0xff) &
+ !DANUBE_BIU_WDT_CR_PWL_SET (0x3) &
+ !DANUBE_BIU_WDT_CR_CLKDIV_SET (0x3) &
+ !DANUBE_BIU_WDT_CR_RELOAD_SET (0xffff));
+
+ wdt_cr |= (DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW2) |
+ DANUBE_BIU_WDT_CR_PWL_SET (pwl) |
+ DANUBE_BIU_WDT_CR_CLKDIV_SET (clkdiv) |
+ DANUBE_BIU_WDT_CR_RELOAD_SET (wdt_reload) |
+ DANUBE_BIU_WDT_CR_GEN);
+
+ /* Set reload value in second password access */
+ *DANUBE_BIU_WDT_CR = wdt_cr;
+ printk ("enabled\n");
+ return 0;
+}
+
+void
+danube_wdt_disable (void)
+{
+ /* Write first part of password access */
+ writel(DANUBE_BIU_WDT_CR_PW_SET(DANUBE_WDT_PW1), DANUBE_BIU_WDT_CR);
+
+ /* Disable the watchdog in second password access (GEN=0) */
+ writel(DANUBE_BIU_WDT_CR_PW_SET(DANUBE_WDT_PW2), DANUBE_BIU_WDT_CR);
+}
+
+void
+danube_wdt_low_power (int en)
+{
+ unsigned int wdt_cr = 0;
+
+ writel(DANUBE_BIU_WDT_CR_PW_SET(DANUBE_WDT_PW1), DANUBE_BIU_WDT_CR);
+
+ wdt_cr = readl(DANUBE_BIU_WDT_CR);
+
+ if (en)
+ {
+ wdt_cr &= (!DANUBE_BIU_WDT_CR_PW_SET(0xff));
+ wdt_cr |=
+ (DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW2) |
+ DANUBE_BIU_WDT_CR_LPEN);
+ }
+ else {
+ wdt_cr &= (!DANUBE_BIU_WDT_CR_PW_SET (0xff) &
+ !DANUBE_BIU_WDT_CR_LPEN);
+ wdt_cr |= DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW2);
+ }
+
+ /* Set reload value in second password access */
+ writel(wdt_cr, DANUBE_BIU_WDT_CR);
+}
+
+void
+danube_wdt_debug_suspend (int en)
+{
+ unsigned int wdt_cr = 0;
+
+ writel(DANUBE_BIU_WDT_CR_PW_SET(DANUBE_WDT_PW1), DANUBE_BIU_WDT_CR);
+
+ wdt_cr = readl(DANUBE_BIU_WDT_CR);
+ if (en)
+ {
+ wdt_cr &= (!DANUBE_BIU_WDT_CR_PW_SET (0xff));
+ wdt_cr |=
+ (DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW2) |
+ DANUBE_BIU_WDT_CR_DSEN);
+ }
+ else {
+ wdt_cr &= (!DANUBE_BIU_WDT_CR_PW_SET (0xff) &
+ !DANUBE_BIU_WDT_CR_DSEN);
+ wdt_cr |= DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW2);
+ }
+
+ /* Set reload value in second password access */
+ writel(wdt_cr, DANUBE_BIU_WDT_CR);
+}
+
+void
+danube_wdt_prewarning_limit (int pwl)
+{
+ unsigned int wdt_cr = 0;
+
+ wdt_cr = readl(DANUBE_BIU_WDT_CR);
+ writel(DANUBE_BIU_WDT_CR_PW_SET(DANUBE_WDT_PW1), DANUBE_BIU_WDT_CR);
+
+ wdt_cr &= 0xff00ffff; //(!DANUBE_BIU_WDT_CR_PW_SET(0xff));
+ wdt_cr &= 0xf3ffffff; //(!DANUBE_BIU_WDT_CR_PWL_SET(3));
+ wdt_cr |= (DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW2) |
+ DANUBE_BIU_WDT_CR_PWL_SET (pwl));
+
+ /* Set reload value in second password access */
+ writel(wdt_cr, DANUBE_BIU_WDT_CR);
+}
+
+void
+danube_wdt_set_clkdiv (int clkdiv)
+{
+ unsigned int wdt_cr = 0;
+
+ wdt_cr = readl(DANUBE_BIU_WDT_CR);
+ writel(DANUBE_BIU_WDT_CR_PW_SET(DANUBE_WDT_PW1), DANUBE_BIU_WDT_CR);
+
+ wdt_cr &= 0xff00ffff; //(!DANUBE_BIU_WDT_CR_PW_SET(0xff));
+ wdt_cr &= 0xfcffffff; //(!DANUBE_BIU_WDT_CR_CLKDIV_SET(3));
+ wdt_cr |= (DANUBE_BIU_WDT_CR_PW_SET (DANUBE_WDT_PW2) |
+ DANUBE_BIU_WDT_CR_CLKDIV_SET (clkdiv));
+
+ /* Set reload value in second password access */
+ writel(wdt_cr, DANUBE_BIU_WDT_CR);
+}
+
+static int
+danube_wdt_ioctl (struct inode *inode, struct file *file, unsigned int cmd,
+ unsigned long arg)
+{
+ int result = 0;
+ int en = 0;
+ int istatus;
+ int pwl, clkdiv;
+ static int timeout = -1;
+
+ switch (cmd)
+ {
+ case DANUBE_WDT_IOC_START:
+ printk("enable watch dog timer!\n");
+ if (copy_from_user((void *) &timeout, (void *) arg, sizeof (int)))
+ {
+ printk ("invalid argument\n");
+ result = -EINVAL;
+ } else {
+ if ((result = danube_wdt_enable (timeout)) < 0)
+ timeout = -1;
+ }
+ break;
+
+ case DANUBE_WDT_IOC_STOP:
+ printk("disable watch dog timer\n");
+ timeout = -1;
+ danube_wdt_disable();
+ break;
+
+ case DANUBE_WDT_IOC_PING:
+ if (timeout < 0)
+ result = -EIO;
+ else
+ result = danube_wdt_enable(timeout);
+ break;
+
+ case DANUBE_WDT_IOC_SET_PWL:
+ if (copy_from_user((void *) &pwl, (void *) arg, sizeof (int)))
+ result = -EINVAL;
+ danube_wdt_prewarning_limit(pwl);
+ break;
+
+ case DANUBE_WDT_IOC_SET_DSEN:
+ if (copy_from_user((void *) &en, (void *) arg, sizeof (int)))
+ result = -EINVAL;
+ danube_wdt_debug_suspend (en);
+ break;
+
+ case DANUBE_WDT_IOC_SET_LPEN:
+ if (copy_from_user((void *) &en, (void *) arg, sizeof (int)))
+ result = -EINVAL;
+ danube_wdt_low_power(en);
+ break;
+
+ case DANUBE_WDT_IOC_SET_CLKDIV:
+ if (copy_from_user((void *) &clkdiv, (void *) arg, sizeof (int)))
+ result = -EINVAL;
+ danube_wdt_set_clkdiv (clkdiv);
+ break;
+
+ case DANUBE_WDT_IOC_GET_STATUS:
+ istatus = readl(DANUBE_BIU_WDT_SR);
+ copy_to_user((int *) arg, (int *) &istatus, sizeof (int));
+ break;
+ }
+
+ return result;
+}
+
+static int
+danube_wdt_open (struct inode *inode, struct file *file)
+{
+ if (danube_wdt_inuse)
+ return -EBUSY;
+ danube_wdt_inuse = 1;
+
+ return 0;
+}
+
+static int
+danube_wdt_release (struct inode *inode, struct file *file)
+{
+ danube_wdt_inuse = 0;
+
+ return 0;
+}
+
+int
+danube_wdt_register_proc_read (char *buf, char **start, off_t offset, int count,
+ int *eof, void *data)
+{
+ int len = 0;
+ len += sprintf (buf + len, "DANUBE_BIU_WDT_PROC_READ\n");
+
+ len += sprintf (buf + len, "DANUBE_BIU_WDT_CR(0x%08x) : 0x%08x\n",
+ (unsigned int)DANUBE_BIU_WDT_CR,
+ readl(DANUBE_BIU_WDT_CR));
+ len += sprintf (buf + len, "DANUBE_BIU_WDT_SR(0x%08x) : 0x%08x\n",
+ (unsigned int)DANUBE_BIU_WDT_SR,
+ readl(DANUBE_BIU_WDT_SR));
+
+ *eof = 1;
+
+ return len;
+}
+
+static struct file_operations wdt_fops = {
+ .owner = THIS_MODULE,
+ .ioctl = danube_wdt_ioctl,
+ .open = danube_wdt_open,
+ .release = danube_wdt_release,
+};
+
+int __init
+danube_wdt_init_module (void)
+{
+ danube_wdt_major = register_chrdev(0, "wdt", &wdt_fops);
+
+ if (danube_wdt_major < 0)
+ {
+ printk("cannot register watchdog device\n");
+
+ return -EINVAL;
+ }
+
+ create_proc_read_entry("danube_wdt", 0, NULL, danube_wdt_register_proc_read, NULL);
+
+ printk("danube watchdog loaded\n");
+
+ return 0;
+}
+
+void
+danube_wdt_cleanup_module (void)
+{
+ unregister_chrdev(danube_wdt_major, "wdt");
+ remove_proc_entry("danube_wdt", NULL);
+}
+
+module_init(danube_wdt_init_module);
+module_exit(danube_wdt_cleanup_module);
diff --git a/target/linux/danube/files/include/asm-mips/danube/danube.h b/target/linux/danube/files/include/asm-mips/danube/danube.h
index d2c925cd39..5809fd94cd 100644
--- a/target/linux/danube/files/include/asm-mips/danube/danube.h
+++ b/target/linux/danube/files/include/asm-mips/danube/danube.h
@@ -285,4 +285,23 @@
#define DANUBE_GPIO_P1_ALTSEL1 ((u32*)(DANUBE_GPIO_BASE_ADDR + 0x0050))
#define DANUBE_GPIO_P1_DIR ((u32*)(DANUBE_GPIO_BASE_ADDR + 0x0048))
+
+/*------------ WDT */
+
+#define DANUBE_WDT_BASE_ADDR (KSEG1 + 0x1F880000)
+
+#define DANUBE_BIU_WDT_CR ((u32*)(DANUBE_WDT_BASE_ADDR + 0x03F0))
+#define DANUBE_BIU_WDT_SR ((u32*)(DANUBE_WDT_BASE_ADDR + 0x03F8))
+
+#define DANUBE_BIU_WDT_CR_GEN (1 << 31)
+#define DANUBE_BIU_WDT_CR_DSEN (1 << 30)
+#define DANUBE_BIU_WDT_CR_LPEN (1 << 29)
+
+#define DANUBE_BIU_WDT_CR_CLKDIV_GET(value) (((value) >> 24) & ((1 << 2) - 1))
+#define DANUBE_BIU_WDT_CR_PWL_GET(value) (((value) >> 26) & ((1 << 2) - 1))
+#define DANUBE_BIU_WDT_CR_PWL_SET(value) ((((1 << 2) - 1) & (value)) << 26)
+#define DANUBE_BIU_WDT_CR_PW_SET(value) (((( 1 << 8) - 1) & (value)) << 16)
+#define DANUBE_BIU_WDT_CR_CLKDIV_SET(value) (((( 1 << 2) - 1) & (value)) << 24)
+#define DANUBE_BIU_WDT_CR_RELOAD_SET(value) (((( 1 << 16) - 1) & (value)) << 0)
+
#endif
diff --git a/target/linux/danube/files/include/asm-mips/danube/danube_wdt.h b/target/linux/danube/files/include/asm-mips/danube/danube_wdt.h
new file mode 100644
index 0000000000..1c31fc9ee2
--- /dev/null
+++ b/target/linux/danube/files/include/asm-mips/danube/danube_wdt.h
@@ -0,0 +1,48 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright (C) 2005 infineon
+ * Copyright (C) 2007 John Crispin <blogic@openwrt.org>
+ *
+ */
+
+#ifndef DANUBE_WDT_H
+#define DANUBE_WDT_H
+
+/* Danube wdt ioctl control */
+#define DANUBE_WDT_IOC_MAGIC 0xc0
+#define DANUBE_WDT_IOC_START _IOW(DANUBE_WDT_IOC_MAGIC, 0, int)
+#define DANUBE_WDT_IOC_STOP _IO(DANUBE_WDT_IOC_MAGIC, 1)
+#define DANUBE_WDT_IOC_PING _IO(DANUBE_WDT_IOC_MAGIC, 2)
+#define DANUBE_WDT_IOC_SET_PWL _IOW(DANUBE_WDT_IOC_MAGIC, 3, int)
+#define DANUBE_WDT_IOC_SET_DSEN _IOW(DANUBE_WDT_IOC_MAGIC, 4, int)
+#define DANUBE_WDT_IOC_SET_LPEN _IOW(DANUBE_WDT_IOC_MAGIC, 5, int)
+#define DANUBE_WDT_IOC_GET_STATUS _IOR(DANUBE_WDT_IOC_MAGIC, 6, int)
+#define DANUBE_WDT_IOC_SET_CLKDIV _IOW(DANUBE_WDT_IOC_MAGIC, 7, int)
+
+/* password 1 and 2 */
+#define DANUBE_WDT_PW1 0x000000BE
+#define DANUBE_WDT_PW2 0x000000DC
+
+#define DANUBE_WDT_CLKDIV0_VAL 1
+#define DANUBE_WDT_CLKDIV1_VAL 64
+#define DANUBE_WDT_CLKDIV2_VAL 4096
+#define DANUBE_WDT_CLKDIV3_VAL 262144
+#define DANUBE_WDT_CLKDIV0 0
+#define DANUBE_WDT_CLKDIV1 1
+#define DANUBE_WDT_CLKDIV2 2
+#define DANUBE_WDT_CLKDIV3 3
+
+#endif
diff --git a/target/linux/danube/patches/110-drivers.patch b/target/linux/danube/patches/110-drivers.patch
index 031ece6caa..3004672dc2 100644
--- a/target/linux/danube/patches/110-drivers.patch
+++ b/target/linux/danube/patches/110-drivers.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.23/drivers/serial/Kconfig
===================================================================
---- linux-2.6.23.orig/drivers/serial/Kconfig 2007-11-04 17:29:22.000000000 +0100
-+++ linux-2.6.23/drivers/serial/Kconfig 2007-11-04 17:29:25.000000000 +0100
+--- linux-2.6.23.orig/drivers/serial/Kconfig 2007-12-10 21:38:39.000000000 +0100
++++ linux-2.6.23/drivers/serial/Kconfig 2007-12-10 21:38:42.000000000 +0100
@@ -1259,4 +1259,10 @@
Currently, only 8250 compatible ports are supported, but
others can easily be added.
@@ -15,8 +15,8 @@ Index: linux-2.6.23/drivers/serial/Kconfig
endmenu
Index: linux-2.6.23/drivers/serial/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/serial/Makefile 2007-11-04 17:29:22.000000000 +0100
-+++ linux-2.6.23/drivers/serial/Makefile 2007-11-04 17:29:25.000000000 +0100
+--- linux-2.6.23.orig/drivers/serial/Makefile 2007-12-10 21:38:39.000000000 +0100
++++ linux-2.6.23/drivers/serial/Makefile 2007-12-10 21:38:42.000000000 +0100
@@ -64,3 +64,4 @@
obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
@@ -24,8 +24,8 @@ Index: linux-2.6.23/drivers/serial/Makefile
+obj-$(CONFIG_SERIAL_DANUBE) += danube_asc.o
Index: linux-2.6.23/drivers/mtd/maps/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-11-04 17:29:22.000000000 +0100
-+++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-11-04 17:29:25.000000000 +0100
+--- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-12-10 21:38:39.000000000 +0100
++++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-12-10 21:38:42.000000000 +0100
@@ -71,3 +71,4 @@
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
@@ -33,8 +33,8 @@ Index: linux-2.6.23/drivers/mtd/maps/Makefile
+obj-$(CONFIG_MTD_DANUBE) += danube.o
Index: linux-2.6.23/drivers/net/Kconfig
===================================================================
---- linux-2.6.23.orig/drivers/net/Kconfig 2007-11-04 17:29:25.000000000 +0100
-+++ linux-2.6.23/drivers/net/Kconfig 2007-11-11 16:48:24.000000000 +0100
+--- linux-2.6.23.orig/drivers/net/Kconfig 2007-12-10 21:38:42.000000000 +0100
++++ linux-2.6.23/drivers/net/Kconfig 2007-12-10 21:38:42.000000000 +0100
@@ -339,6 +339,18 @@
source "drivers/net/arm/Kconfig"
@@ -56,8 +56,8 @@ Index: linux-2.6.23/drivers/net/Kconfig
depends on ARM || MIPS
Index: linux-2.6.23/drivers/net/Makefile
===================================================================
---- linux-2.6.23.orig/drivers/net/Makefile 2007-11-04 17:29:25.000000000 +0100
-+++ linux-2.6.23/drivers/net/Makefile 2007-11-11 16:47:14.000000000 +0100
+--- linux-2.6.23.orig/drivers/net/Makefile 2007-12-10 21:38:42.000000000 +0100
++++ linux-2.6.23/drivers/net/Makefile 2007-12-10 21:38:42.000000000 +0100
@@ -208,6 +208,7 @@
obj-$(CONFIG_FEC_8XX) += fec_8xx/
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
@@ -66,3 +66,15 @@ Index: linux-2.6.23/drivers/net/Makefile
obj-$(CONFIG_MACB) += macb.o
+Index: linux-2.6.23/drivers/char/watchdog/Makefile
+===================================================================
+--- linux-2.6.23.orig/drivers/char/watchdog/Makefile 2007-12-10 21:41:51.000000000 +0100
++++ linux-2.6.23/drivers/char/watchdog/Makefile 2007-12-10 21:42:30.000000000 +0100
+@@ -90,6 +90,7 @@
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
+ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
++obj-$(CONFIG_DANUBE_WDT) += danube_wdt.o
+
+ # PARISC Architecture
+