Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=46b814d6e00c1a1e3127f8f9c254dda310781bec
Commit:     46b814d6e00c1a1e3127f8f9c254dda310781bec
Parent:     47d17763e987ebd5e9266fe3d9af3b22a64d27d8
Author:     Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 14 12:08:54 2007 +0100
Committer:  Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Sun Jun 17 18:41:32 2007 +0000

    [WATCHDOG] s3c2410_wdt announce initialisation
    
    Announce the watchdog once the initialisation is
    complete. This aides debugging problems where the
    watchdog driver has been loaded and shows the
    current state for the user.
    
    Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
    Signed-off-by: Wim Van Sebroeck <[EMAIL PROTECTED]>
---
 drivers/char/watchdog/s3c2410_wdt.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/drivers/char/watchdog/s3c2410_wdt.c 
b/drivers/char/watchdog/s3c2410_wdt.c
index 20fa29c..7cc0263 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -348,6 +348,7 @@ static irqreturn_t s3c2410wdt_irq(int irqno, void *param)
 static int s3c2410wdt_probe(struct platform_device *pdev)
 {
        struct resource *res;
+       unsigned int wtcon;
        int started = 0;
        int ret;
        int size;
@@ -433,6 +434,16 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
                s3c2410wdt_stop();
        }
 
+       /* print out a statement of readiness */
+
+       wtcon = readl(wdt_base + S3C2410_WTCON);
+
+       dev_info(&pdev->dev,
+                "watchdog %sactive, reset %sabled, irq %sabled\n",
+                (wtcon & S3C2410_WTCON_ENABLE) ?  "" : "in",
+                (wtcon & S3C2410_WTCON_RSTEN) ? "" : "dis",
+                (wtcon & S3C2410_WTCON_INTEN) ? "" : "en");
+
        return 0;
 
  err_clk:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to