diff options
| author | John Crispin <john@openwrt.org> | 2012-08-03 08:53:02 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2012-08-03 08:53:02 +0000 |
| commit | 060b161ca6f18e0e022da1483723ad2e9335bca7 (patch) | |
| tree | dc652c26bed4d4b79395a6daafaa5da59000e940 /target/linux/lantiq/patches-3.3/0010-watchdog-support.patch | |
| parent | 162e272b4b2b770cd5eb97006bb4ff99b09bd8de (diff) | |
| download | upstream-060b161ca6f18e0e022da1483723ad2e9335bca7.tar.gz upstream-060b161ca6f18e0e022da1483723ad2e9335bca7.tar.bz2 upstream-060b161ca6f18e0e022da1483723ad2e9335bca7.zip | |
cleanup patches
SVN-Revision: 32953
Diffstat (limited to 'target/linux/lantiq/patches-3.3/0010-watchdog-support.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.3/0010-watchdog-support.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.3/0010-watchdog-support.patch b/target/linux/lantiq/patches-3.3/0010-watchdog-support.patch new file mode 100644 index 0000000000..2a17107880 --- /dev/null +++ b/target/linux/lantiq/patches-3.3/0010-watchdog-support.patch @@ -0,0 +1,74 @@ +From 8b0fb3cc6548fa4b531a26a605a0e213962bb889 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Fri, 3 Aug 2012 09:54:14 +0200 +Subject: [PATCH 10/25] watchdog support + +--- + drivers/watchdog/lantiq_wdt.c | 23 +++++------------------ + 1 files changed, 5 insertions(+), 18 deletions(-) + +diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c +index d3a63be..70127b3 100644 +--- a/drivers/watchdog/lantiq_wdt.c ++++ b/drivers/watchdog/lantiq_wdt.c +@@ -16,7 +16,7 @@ + #include <linux/clk.h> + #include <linux/io.h> + +-#include <lantiq.h> ++#include <lantiq_soc.h> + + /* Section 3.4 of the datasheet + * The password sequence protects the WDT control register from unintended +@@ -182,7 +182,7 @@ static struct miscdevice ltq_wdt_miscdev = { + .fops = <q_wdt_fops, + }; + +-static int __init ++static int __devinit + ltq_wdt_probe(struct platform_device *pdev) + { + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +@@ -206,7 +206,7 @@ ltq_wdt_probe(struct platform_device *pdev) + } + + /* we do not need to enable the clock as it is always running */ +- clk = clk_get(&pdev->dev, "io"); ++ clk = clk_get_io(); + WARN_ON(!clk); + ltq_io_region_clk_rate = clk_get_rate(clk); + clk_put(clk); +@@ -227,6 +227,7 @@ ltq_wdt_remove(struct platform_device *pdev) + + + static struct platform_driver ltq_wdt_driver = { ++ .probe = ltq_wdt_probe, + .remove = __devexit_p(ltq_wdt_remove), + .driver = { + .name = "ltq_wdt", +@@ -234,21 +235,7 @@ static struct platform_driver ltq_wdt_driver = { + }, + }; + +-static int __init +-init_ltq_wdt(void) +-{ +- return platform_driver_probe(<q_wdt_driver, ltq_wdt_probe); +-} +- +-static void __exit +-exit_ltq_wdt(void) +-{ +- return platform_driver_unregister(<q_wdt_driver); +-} +- +-module_init(init_ltq_wdt); +-module_exit(exit_ltq_wdt); +- ++module_platform_driver(ltq_wdt_driver); + module_param(nowayout, int, 0); + MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); + +-- +1.7.9.1 + |