From patchwork Wed May 11 23:19:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 9075941 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 84AC99F1C1 for ; Wed, 11 May 2016 23:21:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B4D7120148 for ; Wed, 11 May 2016 23:21:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04B4220114 for ; Wed, 11 May 2016 23:21:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b0dPv-0002Nc-1h; Wed, 11 May 2016 23:19:47 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b0dPn-0002KO-Ri for linux-arm-kernel@lists.infradead.org; Wed, 11 May 2016 23:19:40 +0000 Received: by mail-pa0-x231.google.com with SMTP id xk12so22637082pac.0 for ; Wed, 11 May 2016 16:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CcBqancOqNquiSDIHTNUnlm3b4lDAis80doYXvkB6WQ=; b=gAFPzJUvjkk2J1ai8lm+aTyMi8V29quDnPnmfZuDc9NvacuDPmwTeCjERkKkNcqxBZ AOtvVxAASazOQatldZMeFqg0yWO49eX4EP+qMFeb4/H9IjSsjVdVQHejAW9OQNAho+OF mcbinD/5NdM/1CKFEEZpZzCTLTwLn0W+6sfxU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CcBqancOqNquiSDIHTNUnlm3b4lDAis80doYXvkB6WQ=; b=D/ZoYYMlOS30BVZeZ1fG1C9zsrO0WNhoDJT4cDvhmmJVQ9vqbY2UHlQYd1xtBMJfMc ROV23ZLOKBiUAKxhqwLARlIoALPKeONj3zhXZIpYkQVQJgw+oqXoQrp9MpIsi4b9hPMt P5gZri+caUq8//pHRByVxzPPnVOuhFagyTeCqC2SOeMvhbFJ9o6/gAx2065hixZLIE41 eelc/Kd8eDBYHKhMGqWbu7VcV8O38kvPaGFaIV09qsXchb3eqh/eII7sWwwmwYRLPgkq s0f4fMSE3dJcdaHNvsoFC5GodtOLNbN+DbSysIMIcsnRJ1w9E5gr71DR3zEwcj4eHlPJ qdag== X-Gm-Message-State: AOPr4FWXYCFf/M5SxN/pAqDwLJt1YDRZpKY54HGMGAkiRPOMa+qGZeJNk39etmqQej/9zkle X-Received: by 10.66.95.102 with SMTP id dj6mr8895308pab.152.1463008758956; Wed, 11 May 2016 16:19:18 -0700 (PDT) Received: from venom.rtp.broadcom.com ([216.31.219.19]) by smtp.gmail.com with ESMTPSA id m190sm14744331pfm.29.2016.05.11.16.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 May 2016 16:19:18 -0700 (PDT) From: Jon Mason X-Google-Original-From: Jon Mason To: Florian Fainelli , Arnd Bergmann , Hauke Mehrtens , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala Subject: [PATCH v2 1/3] ARM: dts: bcm5301x: Add TWD WD Support to DT Date: Wed, 11 May 2016 19:19:08 -0400 Message-Id: <1463008750-13902-2-git-send-email-jonmason@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463008750-13902-1-git-send-email-jonmason@broadcom.com> References: <1463008750-13902-1-git-send-email-jonmason@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160511_161940_022489_B775B973 X-CRM114-Status: GOOD ( 13.29 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 65a1309..4b9887f 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 { + timer@20600 { compatible = "arm,cortex-a9-twd-timer"; - reg = <0x20600 0x100>; - interrupts = ; + reg = <0x20600 0x20>; + interrupts = ; + clocks = <&periph_clk>; + }; + + watchdog@20620 { + compatible = "arm,cortex-a9-twd-wdt"; + reg = <0x20620 0x20>; + interrupts = ; clocks = <&periph_clk>; };