From patchwork Tue Aug 27 14:34:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2850231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 884FDBF546 for ; Tue, 27 Aug 2013 15:15:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 646C5202EA for ; Tue, 27 Aug 2013 15:15:04 +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 24E67202DD for ; Tue, 27 Aug 2013 15:15:03 +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 1VEKPE-000832-3G; Tue, 27 Aug 2013 14:38:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VEKON-000549-DQ; Tue, 27 Aug 2013 14:37:11 +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 1VEKMm-0004tz-QV for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2013 14:35:35 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 9B02A84D; Tue, 27 Aug 2013 16:35:26 +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 B876381A; Tue, 27 Aug 2013 16:35:23 +0200 (CEST) From: Ezequiel Garcia To: Subject: [PATCH 10/15] ARM: mvebu: Add RSTOUT cell to system-controller DT node Date: Tue, 27 Aug 2013 11:34:34 -0300 Message-Id: <1377614079-10000-11-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_103535_189583_1D818ADE X-CRM114-Status: UNSURE ( 9.65 ) 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 , 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 In order to allow watchdog to be enabled, add the register to the (optional) second reg cell as specified by the binding. Signed-off-by: Ezequiel Garcia --- arch/arm/boot/dts/armada-370.dtsi | 2 +- arch/arm/boot/dts/armada-xp.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index fa3dfc6..8f63e8e 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -34,7 +34,7 @@ internal-regs { system-controller@18200 { compatible = "marvell,armada-370-xp-system-controller"; - reg = <0x18200 0x100>; + reg = <0x18200 0x100>, <0x20704 0x4>; }; L2: l2-cache { diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index f608412..c4d1219 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -87,7 +87,7 @@ system-controller@18200 { compatible = "marvell,armada-370-xp-system-controller"; - reg = <0x18200 0x500>; + reg = <0x18200 0x500>, <0x20704 0x4>; }; eth2: ethernet@30000 {