From patchwork Wed Sep 19 11:57:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1477121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 521A63FE79 for ; Wed, 19 Sep 2012 12:03:11 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEIwY-0000GW-UI; Wed, 19 Sep 2012 11:59:51 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEIua-000801-8h for linux-arm-kernel@lists.infradead.org; Wed, 19 Sep 2012 11:57:53 +0000 Received: by bkcji2 with SMTP id ji2so452784bkc.36 for ; Wed, 19 Sep 2012 04:57:47 -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=u6bFk1MgdRYbC44zM+T16S5f4asgZUuBEAa2lQAvFqU=; b=McKuxrdLOuRcJeMOxlA+kV73zRZdXrWQ/IdeKNzB7CaQ5tCc2roIrMbG1ZCp0YQr8j kke6H1gky868D25LBkL7UBBwVY3/Aug1jjr2vJami/AEs8T6MdxeJXh6ESTU3yalslM9 R1Or5TpvBfo9xMixmPqv4iNicC7KXxcJBvUcMV/bbv5U5ZVT4ucsMBwtksyILavgqpGQ T4/bpBcdRrx47d9MAN+dzsqeRxgHBbF71pkSYJibx38HzZDU1LclRCvozaF4ShXB3eiy MmIl4dh2MTbsBA3CE06VEtzkRx2CnLc1W/667TdrcVFimx0dw0+M981h8+fmd6ylBn3d hNEA== Received: by 10.204.129.76 with SMTP id n12mr1179532bks.18.1348055866961; Wed, 19 Sep 2012 04:57:46 -0700 (PDT) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id g12sm1686489bkt.7.2012.09.19.04.57.44 (version=SSLv3 cipher=OTHER); Wed, 19 Sep 2012 04:57:45 -0700 (PDT) From: Fabio Porcedda To: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Ferre Subject: [PATCH v2 1/2] watchdog: at91sam9_wdt: add device tree support Date: Wed, 19 Sep 2012 13:57:40 +0200 Message-Id: <1348055861-7857-2-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1348055861-7857-1-git-send-email-fabio.porcedda@gmail.com> References: <1348055861-7857-1-git-send-email-fabio.porcedda@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (fabio.porcedda[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Jean-Christophe PLAGNIOL-VILLARD , devicetree-discuss@lists.ozlabs.org, Russell King 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 Tested on an at91sam9260 board (evk-pro3) Signed-off-by: Fabio Porcedda --- Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++ drivers/watchdog/at91sam9_wdt.c | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt new file mode 100644 index 0000000..fca76fd --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt @@ -0,0 +1,15 @@ +* Atmel Watchdog Timers + +** at91sam9-wdt + +Required properties: +- compatible: must be "atmel,at91sam9-wdt" +- reg: physical base address of the controller and length of memory mapped + region. + +Example: + + watchdog@fffffd40 { + compatible = "atmel,at91sam9-wdt"; + reg = <0xfffffd40 0x10>; + }; diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 05e1be8..c1ba2ed 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "at91sam9_wdt.h" @@ -302,11 +303,21 @@ static int __exit at91wdt_remove(struct platform_device *pdev) return res; } +#if defined(CONFIG_OF) +static const struct of_device_id at91_wdt_dt_ids[] = { + { .compatible = "atmel,at91sam9-wdt" }, + { /* sentinel */ } +}; + +MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); +#endif + static struct platform_driver at91wdt_driver = { .remove = __exit_p(at91wdt_remove), .driver = { .name = "at91_wdt", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(at91_wdt_dt_ids), }, };