From patchwork Tue Oct 2 16:01:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1538111 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 D73B3DFFAD for ; Tue, 2 Oct 2012 16:03:14 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJ4uN-00061G-4M; Tue, 02 Oct 2012 16:01:19 +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 1TJ4uC-0005z4-Jo for linux-arm-kernel@lists.infradead.org; Tue, 02 Oct 2012 16:01:09 +0000 Received: by bkwj4 with SMTP id j4so5247270bkw.36 for ; Tue, 02 Oct 2012 09:01:07 -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=5eJwFf0qiGcUrpGp04FT1O7lej1JpyafboKPi3xBO/k=; b=zKIxkJa9rtYDr392HNRN34h7Dg5POdExczYSetjwfRAroHqJK+BOylP/rzUjojg3JU nJy/SYzeXWCgGzP9SoliM1EECc+7Qu4qsUd5+PPH7BcWU+PKKdsatLbq+pxsWB4g+yWP BRYjuLVBi8dtlM+NoEFgLZW5CgCCvzyY81T++1Z8foRWlUObUErVfXCGKcolQhlkZHzz Omb/dlUupw5V/HhvudRbbqfL4CdQ2mOYw+HDwsCRhUIOrZCwjykQIR9PGWmqYOY6cpjL XY+gAgGg0E74k3rgyhP/KcMpnXd7oSKeOQG/4d4S7AHybWlluI8KGcbs/uiYSSst4RmN MD6Q== Received: by 10.204.5.215 with SMTP id 23mr6796690bkw.101.1349193667377; Tue, 02 Oct 2012 09:01:07 -0700 (PDT) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id m19sm1693233bkm.8.2012.10.02.09.01.05 (version=SSLv3 cipher=OTHER); Tue, 02 Oct 2012 09:01:06 -0700 (PDT) From: Fabio Porcedda To: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD , Andrew Victor Subject: [PATCH v7 1/3] watchdog: at91sam9_wdt: add device tree support Date: Tue, 2 Oct 2012 18:01:00 +0200 Message-Id: <1349193662-23482-2-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1349193662-23482-1-git-send-email-fabio.porcedda@gmail.com> References: <1349193662-23482-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: devicetree-discuss@lists.ozlabs.org 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..2957ebb --- /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,at91sam9260-wdt". +- reg: physical base address of the controller and length of memory mapped + region. + +Example: + + watchdog@fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + }; diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 05e1be8..6dad954 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,at91sam9260-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), }, };