diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-05-13 12:04:04 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-05-13 12:04:04 +0000 |
| commit | 99ceef899c32a799aac55bee9e440ce137377161 (patch) | |
| tree | 81e6b3d8ce9a029720d6d022eb33da1f3ed8fa17 /target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch | |
| parent | 7ae260dc28b039abd2e81412e108c0f5a0874ccf (diff) | |
| download | upstream-99ceef899c32a799aac55bee9e440ce137377161.tar.gz upstream-99ceef899c32a799aac55bee9e440ce137377161.tar.bz2 upstream-99ceef899c32a799aac55bee9e440ce137377161.zip | |
gemini: remove 2.6.37 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31700 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch')
| -rw-r--r-- | target/linux/gemini/patches/004-gemini-disable-watchdog-in-probe.patch | 24 |
1 files changed, 0 insertions, 24 deletions
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 d1f5c340da..0000000000 --- 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; |