From patchwork Sat Jun 13 11:39:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Noralf_Tr=C3=B8nnes?= X-Patchwork-Id: 6602481 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 AF5A19F2F4 for ; Sat, 13 Jun 2015 11:42:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAF1C206E8 for ; Sat, 13 Jun 2015 11:42:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ECEF2206E6 for ; Sat, 13 Jun 2015 11:42:42 +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 1Z3jnM-0003XZ-DX; Sat, 13 Jun 2015 11:40:16 +0000 Received: from asav21.altibox.net ([109.247.116.8]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z3jnI-0002Nw-7S; Sat, 13 Jun 2015 11:40:13 +0000 Received: from localhost (localhost [127.0.0.1]) by asav21.altibox.net (Postfix) with ESMTP id 107FD803A6; Sat, 13 Jun 2015 13:39:46 +0200 (CEST) Received: from asav21.altibox.net ([127.0.0.1]) by localhost (asav21.lysetele.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id zUlz8vWQNbOQ; Sat, 13 Jun 2015 13:39:45 +0200 (CEST) Received: from localhost.localdomain (48.81-166-104.customer.lyse.net [81.166.104.48]) by asav21.altibox.net (Postfix) with ESMTP id 9F0148021F; Sat, 13 Jun 2015 13:39:45 +0200 (CEST) From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/3] ARM: dts: bcm2835-rpi: Add "brcm, raspberrypi-pm-wdt" to wdt compatible Date: Sat, 13 Jun 2015 13:39:01 +0200 Message-Id: <1434195541-28368-3-git-send-email-noralf@tronnes.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1434195541-28368-1-git-send-email-noralf@tronnes.org> References: <1434195541-28368-1-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150613_044012_459759_D943182D X-CRM114-Status: UNSURE ( 7.65 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) Cc: devicetree@vger.kernel.org, =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 The Raspberry Pi uses a new value for halt in the PM_RSTS watchdog register. Expand the compatible string to cover this. Signed-off-by: Noralf Trønnes Tested-by: Stephen Warren --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 ++++ arch/arm/boot/dts/bcm2835.dtsi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 46780bb..feb1282 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -16,6 +16,10 @@ }; }; +&watchdog { + compatible = "brcm,raspberrypi-pm-wdt", "brcm,bcm2835-pm-wdt"; +}; + &gpio { pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi index 301c73f..3445bb3 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -52,7 +52,7 @@ #interrupt-cells = <2>; }; - watchdog@7e100000 { + watchdog: watchdog@7e100000 { compatible = "brcm,bcm2835-pm-wdt"; reg = <0x7e100000 0x28>; };