From patchwork Wed Nov 14 07:16:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenyou Yang X-Patchwork-Id: 1739321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 5404FDF264 for ; Wed, 14 Nov 2012 07:23:25 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYXGw-0002MC-Ho; Wed, 14 Nov 2012 07:20:30 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TYXG7-0002Ci-O8 for linux-arm-kernel@lists.infradead.org; Wed, 14 Nov 2012 07:19:42 +0000 Received: from penbh01.corp.atmel.com ([10.168.5.31]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id qAE7E6GF008421; Tue, 13 Nov 2012 23:14:22 -0800 (PST) Received: from penmb01.corp.atmel.com ([10.168.5.33]) by penbh01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 14 Nov 2012 15:19:26 +0800 Received: from shaarm01.corp.atmel.com ([10.217.6.34]) by penmb01.corp.atmel.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 14 Nov 2012 15:19:26 +0800 From: Wenyou Yang To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/11] watchdog/at91sam9_wdt: change "at91_wdt_settimeout" function name to "at91wdt_enable" Date: Wed, 14 Nov 2012 15:16:02 +0800 Message-Id: <1352877369-19740-5-git-send-email-wenyou.yang@atmel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352877369-19740-1-git-send-email-wenyou.yang@atmel.com> References: <1352877369-19740-1-git-send-email-wenyou.yang@atmel.com> X-OriginalArrivalTime: 14 Nov 2012 07:19:26.0619 (UTC) FILETIME=[6112C6B0:01CDC238] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121114_021940_245183_E99E7FEE X-CRM114-Status: GOOD ( 14.48 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-watchdog@vger.kernel.org, JM.Lin@atmel.com, nicolas.ferre@atmel.com, linux-kernel@vger.kernel.org, wenyou.yang@atmel.com, wim@iguana.be, plagnioj@jcrosoft.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Change the "at91_wdt_settimeout" function name to "at91wdt_enable" for more reasonable, and also set the drvdata->enabled value. Signed-off-by: Wenyou Yang --- drivers/watchdog/at91sam9_wdt.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 98e7d5a..e2d6111 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -13,6 +13,9 @@ * The Watchdog Timer Mode Register can be only written to once. If the * timeout need to be set from Linux, be sure that the bootstrap or the * bootloader doesn't write to this register. + * The Watchdog Timer default is running with maximum counter value + * (WDV=0xfff) at reset, i.e., at power-up. It MUST be either disabled + * or be reprogrammed within the maxinum margin(16s). */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -105,20 +108,20 @@ static void at91_ping(unsigned long data) pr_crit("I will reset your machine !\n"); } -/* - * Set the watchdog time interval in 1/256Hz (write-once) - * Counter is 12 bit. - */ -static int at91_wdt_settimeout(struct watchdog_device *wddev, - unsigned int timeout) +static int at91wdt_enable(struct watchdog_device *wddev, unsigned int timeout) { struct at91wdt_drvdata *driver_data = watchdog_get_drvdata(wddev); unsigned int reg; unsigned int mr; - /* Check if disabled */ + /* Check if the watchdog is disabled, + * if disabled, the reason is the bootstrap or the bootloader has + * written the Watchdog Timer Mode Register to disable the + * watchdog timer + */ mr = wdt_read(driver_data, AT91_WDT_MR); if (mr & AT91_WDT_WDDIS) { + driver_data->enabled = false; pr_err("sorry, watchdog is disabled\n"); return -EIO; } @@ -136,6 +139,8 @@ static int at91_wdt_settimeout(struct watchdog_device *wddev, | (timeout & AT91_WDT_WDV); /* timer value */ wdt_write(driver_data, AT91_WDT_MR, reg); + driver_data->enabled = true; + return 0; } @@ -169,10 +174,11 @@ static int __init at91wdt_probe(struct platform_device *pdev) watchdog_set_drvdata(&at91_wddev, driver_data); - /* Set watchdog */ - res = at91_wdt_settimeout(ms_to_ticks(WDT_HW_TIMEOUT * 1000)); - if (res) - return res; + res = at91wdt_enable(&at91_wddev); + if (res) { + dev_err(&pdev->dev, "cannot enable watchdog (%d)\n", ret); + return ret; + } driver_data->next_heartbeat = jiffies + heartbeat * HZ; setup_timer(&driver_data->timer, at91_ping, 0);