From patchwork Fri Dec 18 21:37:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 58756 Delivered-To: patch@linaro.org Received: by 10.112.89.199 with SMTP id bq7csp1284851lbb; Fri, 18 Dec 2015 13:38:00 -0800 (PST) X-Received: by 10.66.219.194 with SMTP id pq2mr8551963pac.107.1450474680856; Fri, 18 Dec 2015 13:38:00 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fm6si26381929pab.122.2015.12.18.13.38.00; Fri, 18 Dec 2015 13:38:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030208AbbLRVh7 (ORCPT + 6 others); Fri, 18 Dec 2015 16:37:59 -0500 Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:35302 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030206AbbLRVh6 (ORCPT ); Fri, 18 Dec 2015 16:37:58 -0500 X-IronPort-AV: E=Sophos;i="5.20,447,1444719600"; d="scan'208";a="83808188" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw2-out.broadcom.com with ESMTP; 18 Dec 2015 14:14:53 -0800 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.235.1; Fri, 18 Dec 2015 13:37:57 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.3.235.1; Fri, 18 Dec 2015 13:37:57 -0800 Received: from venom.rtp.broadcom.com (unknown [10.27.64.103]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id B39A140FE5; Fri, 18 Dec 2015 13:34:25 -0800 (PST) From: Jon Mason To: Florian Fainelli CC: Hauke Mehrtens , , , , Subject: [PATCH 1/3] ARM: dts: bcm5301x: Add TWD WD Support to DT Date: Fri, 18 Dec 2015 16:37:54 -0500 Message-ID: <1450474676-10210-1-git-send-email-jonmason@broadcom.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add support for the ARM TWD Watchdog to the bcm5301x device tree. The ARM TWD timer allocated the register space for the WDT, so this patch necessitated shrinking that. Also, the GIC masks were added for these. Signed-off-by: Jon Mason --- arch/arm/boot/dts/bcm5301x.dtsi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 65a1309..c31fafe 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -66,10 +66,19 @@ clocks = <&periph_clk>; }; - local-timer@20600 { + twd-timer@20600 { compatible = "arm,cortex-a9-twd-timer"; - reg = <0x20600 0x100>; - interrupts = ; + reg = <0x20600 0x20>; + interrupts = ; + clocks = <&periph_clk>; + }; + + twd-watchdog@20620 { + compatible = "arm,cortex-a9-twd-wdt"; + reg = <0x20620 0x20>; + interrupts = ; clocks = <&periph_clk>; };