From 501390d55227f2eafced775dbc734b971c279e5e Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 13 May 2012 12:04:04 +0000 Subject: gemini: remove 2.6.37 support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31700 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../004-gemini-disable-watchdog-in-probe.patch | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch (limited to 'target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch') diff --git a/target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch b/target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch deleted file mode 100644 index d1f5c340d..000000000 --- a/target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/watchdog/gemini_wdt.c -+++ b/drivers/watchdog/gemini_wdt.c -@@ -224,6 +224,7 @@ static int __init gemini_wdt_probe(struc - struct resource *res; - void __iomem *base; - struct gemini_wdt_struct *gemini_wdt; -+ unsigned int reg; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { -@@ -267,6 +268,13 @@ static int __init gemini_wdt_probe(struc - - gemini_wdt_miscdev.parent = &pdev->dev; - -+ reg = __raw_readw(gemini_wdt->base + GEMINI_WDCR); -+ if (reg & WDCR_ENABLE) { -+ /* Watchdog was enabled by the bootloader, disable it. */ -+ reg &= ~(WDCR_ENABLE); -+ __raw_writel(reg, gemini_wdt->base + GEMINI_WDCR); -+ } -+ - ret = misc_register(&gemini_wdt_miscdev); - if (ret) - goto fail2; -- cgit v1.2.3