From patchwork Tue Jul 16 13:24:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 2828129 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0BD579F7D6 for ; Tue, 16 Jul 2013 13:25:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A5E22017F for ; Tue, 16 Jul 2013 13:25:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 19CB420120 for ; Tue, 16 Jul 2013 13:25:06 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz5FW-0004oO-D8; Tue, 16 Jul 2013 13:25:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz5FT-0004ab-9s; Tue, 16 Jul 2013 13:24:59 +0000 Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz5FP-0004ZK-2z for linux-arm-kernel@lists.infradead.org; Tue, 16 Jul 2013 13:24:56 +0000 Received: by mail-la0-f46.google.com with SMTP id eg20so529256lab.33 for ; Tue, 16 Jul 2013 06:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=TVKu9NGG2rjRTFeuMPtbva0HbyifB5u7RMJJX53KTeA=; b=hk7oRdNXgMG01zif8Sp9mnIq+GGjQ3Sw5gPVrVMOsoU/EYDGv4hMZ4MTXBOou2DE5r SnoO0gcMHwQFi2B1OWMPFJBxMomHe7pBVmBEV5ZYycuXVDLgudgM3AWpC54qlpntdqyE M7LuUPhe88TDv5gHwXTj7IFY0o82cGeSyWU9QYGxawcYDFfw+aO8H9o14/XJvja2mMi6 a7MQYl8B352xXx8tPTXqESUFu6QdExVH7a2Pkg6k2HsibWbs0ag7RWqOcLFrg+PlYfRj +NgiDu/SUkipy4RYnBSgZ6jnlJvk4P4e/EBY2updUdcjCTBp1oIF5wqkGbkjefUDJdmv RDIg== X-Received: by 10.152.20.40 with SMTP id k8mr779735lae.25.1373981072953; Tue, 16 Jul 2013 06:24:32 -0700 (PDT) Received: from test.ath.cx (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id p10sm632979lap.8.2013.07.16.06.24.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 16 Jul 2013 06:24:31 -0700 (PDT) From: Jonas Jensen To: linux-watchdog@vger.kernel.org Subject: [PATCH v2] watchdog: Add MOXA ART watchdog driver Date: Tue, 16 Jul 2013 15:24:15 +0200 Message-Id: <1373981055-18515-1-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1373545786-7151-1-git-send-email-jonas.jensen@gmail.com> References: <1373545786-7151-1-git-send-email-jonas.jensen@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130716_092455_444709_471E9FFD X-CRM114-Status: GOOD ( 19.00 ) X-Spam-Score: -2.0 (--) Cc: linux-kernel@vger.kernel.org, Jonas Jensen , wim@iguana.be, arm@kernel.org, linux@roeck-us.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add watchdog driver for MOXA ART SoCs. Signed-off-by: Jonas Jensen --- Notes: Thanks for the review Guenter. Changes since v1: 1. remove moxart_wdt_ping 2. remove unnecessary max timeout check in moxart_wdt_set_timeout 3. remove arm_pm_restart and moxart_wdt_restart function (moved to moxart platform startup code) 4. remove unnecessary watchdog_set_drvdata from moxart_wdt_remove 5. stop the watchdog on driver remove Applies to next-20130716 drivers/watchdog/Kconfig | 10 +++ drivers/watchdog/Makefile | 1 + drivers/watchdog/moxart_wdt.c | 171 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 drivers/watchdog/moxart_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 362085d..6883aab 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -382,6 +382,16 @@ config RETU_WATCHDOG To compile this driver as a module, choose M here: the module will be called retu_wdt. +config MOXART_WDT + tristate "MOXART watchdog" + depends on ARCH_MOXART + help + Say Y here to include Watchdog timer support for the watchdog + existing on the MOXA ART SoC series platforms. + + To compile this driver as a module, choose M here: the + module will be called moxart_wdt. + # AVR32 Architecture config AT32AP700X_WDT diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 2f26a0b..7cab53a 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -54,6 +54,7 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o +obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c new file mode 100644 index 0000000..966855d --- /dev/null +++ b/drivers/watchdog/moxart_wdt.c @@ -0,0 +1,171 @@ +/* + * MOXA ART SoCs watchdog driver. + * + * Copyright (C) 2013 Jonas Jensen + * + * Jonas Jensen + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define REG_COUNT 0x4 +#define REG_MODE 0x8 +#define REG_ENABLE 0xC + +struct moxart_wdt_dev { + struct watchdog_device wdt_dev; + void __iomem *wdt_base; +}; + +static struct moxart_wdt_dev *moxart_wdt; +static bool nowayout = WATCHDOG_NOWAYOUT; +static int heartbeat; +static unsigned int clock_frequency; +static unsigned int max_timeout; + +static int moxart_wdt_stop(struct watchdog_device *wdt_dev) +{ + struct moxart_wdt_dev *moxart_wdt = watchdog_get_drvdata(wdt_dev); + void __iomem *wdt_base = moxart_wdt->wdt_base; + + writel(0, wdt_base + REG_ENABLE); + + return 0; +} + +static int moxart_wdt_start(struct watchdog_device *wdt_dev) +{ + struct moxart_wdt_dev *moxart_wdt = watchdog_get_drvdata(wdt_dev); + void __iomem *wdt_base = moxart_wdt->wdt_base; + + writel(clock_frequency * moxart_wdt->wdt_dev.timeout, + wdt_base + REG_COUNT); + writel(0x5ab9, wdt_base + REG_MODE); + writel(0x03, wdt_base + REG_ENABLE); + + return 0; +} + +static int moxart_wdt_set_timeout(struct watchdog_device *wdt_dev, + unsigned int timeout) +{ + dev_dbg(wdt_dev->dev, "%s: timeout=%u\n", __func__, timeout); + + moxart_wdt->wdt_dev.timeout = timeout; + + return 0; +} + +static const struct watchdog_info moxart_wdt_info = { + .identity = "moxart-wdt", + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | + WDIOF_MAGICCLOSE, +}; + +static const struct watchdog_ops moxart_wdt_ops = { + .owner = THIS_MODULE, + .start = moxart_wdt_start, + .stop = moxart_wdt_stop, + .set_timeout = moxart_wdt_set_timeout, +}; + +static int moxart_wdt_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *node = dev->of_node; + struct resource *res; + struct clk *clk; + int err; + + moxart_wdt = devm_kzalloc(&pdev->dev, sizeof(*moxart_wdt), GFP_KERNEL); + if (!moxart_wdt) + return -EINVAL; + + platform_set_drvdata(pdev, moxart_wdt); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + moxart_wdt->wdt_base = devm_ioremap_resource(dev, res); + if (IS_ERR(moxart_wdt->wdt_base)) + return PTR_ERR(moxart_wdt->wdt_base); + + clk = of_clk_get(node, 0); + if (IS_ERR(clk)) { + pr_err("%s: of_clk_get failed\n", __func__); + return PTR_ERR(clk); + } + + clock_frequency = clk_get_rate(clk); + + max_timeout = UINT_MAX / clock_frequency; + + moxart_wdt->wdt_dev.info = &moxart_wdt_info; + moxart_wdt->wdt_dev.ops = &moxart_wdt_ops; + moxart_wdt->wdt_dev.timeout = max_timeout; + moxart_wdt->wdt_dev.min_timeout = 1; + moxart_wdt->wdt_dev.max_timeout = max_timeout; + moxart_wdt->wdt_dev.parent = &pdev->dev; + + watchdog_init_timeout(&moxart_wdt->wdt_dev, heartbeat, &pdev->dev); + watchdog_set_nowayout(&moxart_wdt->wdt_dev, nowayout); + + watchdog_set_drvdata(&moxart_wdt->wdt_dev, moxart_wdt); + + err = watchdog_register_device(&moxart_wdt->wdt_dev); + if (unlikely(err)) + return err; + + dev_dbg(dev, "Watchdog enabled (heartbeat=%d sec, nowayout=%d)\n", + moxart_wdt->wdt_dev.timeout, nowayout); + + return 0; +} + +static int moxart_wdt_remove(struct platform_device *pdev) +{ + struct moxart_wdt_dev *moxart_wdt = platform_get_drvdata(pdev); + + moxart_wdt_stop(&moxart_wdt->wdt_dev); + watchdog_unregister_device(&moxart_wdt->wdt_dev); + + return 0; +} + +static const struct of_device_id moxart_watchdog_match[] = { + { .compatible = "moxa,moxart-watchdog" }, + { }, +}; + +static struct platform_driver moxart_wdt_driver = { + .probe = moxart_wdt_probe, + .remove = moxart_wdt_remove, + .driver = { + .name = "moxart-watchdog", + .owner = THIS_MODULE, + .of_match_table = moxart_watchdog_match, + }, +}; +module_platform_driver(moxart_wdt_driver); + +module_param(heartbeat, int, 0); +MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds"); + +MODULE_DESCRIPTION("MOXART watchdog driver"); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Jonas Jensen ");