From patchwork Tue Aug 27 14:34:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2850232 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 087DA9F313 for ; Tue, 27 Aug 2013 15:17:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDBDF204B5 for ; Tue, 27 Aug 2013 15:17:22 +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 8485520497 for ; Tue, 27 Aug 2013 15:17:21 +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 1VEKOW-0007QN-Q5; Tue, 27 Aug 2013 14:37:22 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEKNh-000514-PH; Tue, 27 Aug 2013 14:36:29 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEKMg-0004sf-Ku for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2013 14:35:27 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 09EA084B; Tue, 27 Aug 2013 16:35:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (unknown [190.2.109.158]) by mail.free-electrons.com (Postfix) with ESMTPA id D43D581A; Tue, 27 Aug 2013 16:35:33 +0200 (CEST) From: Ezequiel Garcia To: Subject: [PATCH 13/15] watchdog: orion: Add other compatibles to devicetree binding Date: Tue, 27 Aug 2013 11:34:37 -0300 Message-Id: <1377614079-10000-14-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1377614079-10000-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1377614079-10000-1-git-send-email-ezequiel.garcia@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130827_103527_215025_946BC26F X-CRM114-Status: UNSURE ( 7.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.7 (---) Cc: Thomas Petazzoni , Lior Amsalem , Jason Cooper , Andrew Lunn , wim@iguana.be, Ezequiel Garcia , Gregory Clement , devicetree@vger.kernel.org, Sebastian Hesselbarth 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-Virus-Scanned: ClamAV using ClamSMTP Add the newly supported compatible-strings for Armada 370 and Armada XP SoC. In addition, specify the required clock inputs for each supported compatible: * orion-wdt and armada-370 requires a single clock phandle * armada-xp requires two clock phandles with clock-names "nbclk" and "fixed". Cc: devicetree@vger.kernel.org Signed-off-by: Ezequiel Garcia --- .../devicetree/bindings/watchdog/orion-wdt.txt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/watchdog/orion-wdt.txt b/Documentation/devicetree/bindings/watchdog/orion-wdt.txt index 5dc8d30..a6e6602 100644 --- a/Documentation/devicetree/bindings/watchdog/orion-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/orion-wdt.txt @@ -2,9 +2,23 @@ Required Properties: -- Compatibility : "marvell,orion-wdt" +- Compatibility : "marvell,orion-wdt", + "marvell,armada-370-wdt" + "marvell,armada-xp-wdt" - reg : Address of the timer registers +Clocks required for compatibles = "marvell,orion-wdt", + "marvell,armada-370-wdt" + +- clocks : Must contain a single entry describing + the clock input. + +Clocks required for compatible = "marvell,armada-xp-wdt": +- clocks : Must contain an entry for each entry in clock-names. +- clock-names : Must include the following entries: + "nbclk" (L2/coherency fabric clock), + "fixed" (Reference 25 MHz fixed-clock). + Optional properties: - timeout-sec : Contains the watchdog timeout in seconds @@ -16,4 +30,5 @@ Example: reg = <0x20300 0x28>; timeout-sec = <10>; status = "okay"; + clocks = <&gate_clk 7>; };