diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-03-26 10:12:54 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-03-26 10:12:54 +0000 |
| commit | 5cbc43005c6c18945b9f135c8852fe7d71a329fe (patch) | |
| tree | c45400aa604a27626d6f747c22b5480a4617921f /target/linux/ar7/patches-2.6.30/140-watchdog_bootcr.patch | |
| parent | 10d4e5b4b0b99def37c31ac574d4bc7cf238dfa9 (diff) | |
| download | upstream-5cbc43005c6c18945b9f135c8852fe7d71a329fe.tar.gz upstream-5cbc43005c6c18945b9f135c8852fe7d71a329fe.tar.bz2 upstream-5cbc43005c6c18945b9f135c8852fe7d71a329fe.zip | |
drop support for 2.6.30
SVN-Revision: 20439
Diffstat (limited to 'target/linux/ar7/patches-2.6.30/140-watchdog_bootcr.patch')
| -rw-r--r-- | target/linux/ar7/patches-2.6.30/140-watchdog_bootcr.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/target/linux/ar7/patches-2.6.30/140-watchdog_bootcr.patch b/target/linux/ar7/patches-2.6.30/140-watchdog_bootcr.patch deleted file mode 100644 index 21c95a7652..0000000000 --- a/target/linux/ar7/patches-2.6.30/140-watchdog_bootcr.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/drivers/watchdog/ar7_wdt.c -+++ b/drivers/watchdog/ar7_wdt.c -@@ -298,14 +298,28 @@ static struct miscdevice ar7_wdt_miscdev - .fops = &ar7_wdt_fops, - }; - -+#define AR7_WDT_HARDWARE_ENABLE 0x10 -+ - static int __init ar7_wdt_init(void) - { - int rc; -+ u32 *bootcr; -+ u32 bootcr_value; - - spin_lock_init(&wdt_lock); - - ar7_wdt_get_regs(); - -+ /* arch/mips/ar7/clocks.c is the only other thing that reads this */ -+ bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4); -+ bootcr_value = *bootcr; -+ iounmap(bootcr); -+ -+ if (!(bootcr_value & AR7_WDT_HARDWARE_ENABLE)) { -+ printk(KERN_INFO DRVNAME ": watchdog disabled in hardware (bootcr=%#x)\n", bootcr_value); -+ return -ENODEV; -+ } -+ - if (!request_mem_region(ar7_regs_wdt, sizeof(struct ar7_wdt), - LONGNAME)) { - printk(KERN_WARNING DRVNAME ": watchdog I/O region busy\n"); |