From patchwork Wed Oct 4 09:16:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 821213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y6Vf52GXZz9t2W for ; Wed, 4 Oct 2017 20:17:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qRGlirwa"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3y6Vf50zTvzDqnb for ; Wed, 4 Oct 2017 20:17:01 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qRGlirwa"; dkim-atps=neutral X-Original-To: linux-aspeed@lists.ozlabs.org Delivered-To: linux-aspeed@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::242; helo=mail-pg0-x242.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qRGlirwa"; dkim-atps=neutral Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3y6Vf14KDNzDqnb for ; Wed, 4 Oct 2017 20:16:57 +1100 (AEDT) Received: by mail-pg0-x242.google.com with SMTP id b11so3662607pgn.0 for ; Wed, 04 Oct 2017 02:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=apOGLkA1Scfd1tzpMDGFGVNZZm7O1M2sN1tnr1ecsXY=; b=qRGlirwao0JnXBJqs3QnPSot5DoTTvXe1FzQZPY/Dz3UdOSxSRfQwTGkMZ/RfuPBwC iBzHWXFzKa4NxZDMfrtUwGPc92DP1fn5ZXeoxpQT2bOzONUSMdvhz9vPaJtHNlQPsf2H oy2m1yi0TaBgD+LvxPfs7QjL0jOtUFgVkemQaIBRpxBiE22LotG6+i18yn+Ufw5Hg20L Ge0OYAZvJQINpN5d2sliktGB5nPPQnxUnY/qM5Y56beNVeg6um2jUF/uMkZxFuw6bkUt HXc0WkwsRIwXGokTT3BzFuiUY3SL7TCaB0IvVkpznWF+wAcXbvtWuIFBkjC3M3jLVHuH 6fzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=apOGLkA1Scfd1tzpMDGFGVNZZm7O1M2sN1tnr1ecsXY=; b=SI2U1aA48Cg5BS//CqwZlFG1JBTDMT/RfsBjxjQC5mBDMCvksWxarGxo08aqlv+KZ3 j5Cth29ReYDdsqBoLLcygeR3mgPUUlYOmK64OzPjrekgKYHVOSox/Ajjvj1tJ3nnIKg3 qFAKJMDAvrXDyvTJ41YGGui1NY3grsQa3aNkotJyjf9fmidHG8W5v+8zJKwN4/piUUl6 r6Tz6H/pg46/0XqnWiSAgUUA2KHzBQl8hlJaLrJXee0zgoJdXD17rKih4W8IsyEF/vo6 oZGTwO+E8RzwDrtol5f9MrTvlgc+aA9inKeZjx17z2z5IF0kSg6YFzlhI5MNri+KQAbw 012w== X-Gm-Message-State: AMCzsaWmZ5p5kdaKhOL5Rbo1oNPKehL62grgW7U0BRWNGKZHcgGhRoMw 00AFuhzrb+0zKGjh5lbVWyk= X-Google-Smtp-Source: AOwi7QA+pZOdSkzyc76CvXm7XYwtbdn05bMIXuDpqZgUweISSSY+pCLPCxzVKItUl/bHPMmCPg2XFw== X-Received: by 10.99.186.92 with SMTP id l28mr7025234pgu.337.1507108615517; Wed, 04 Oct 2017 02:16:55 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id m21sm24291450pgn.60.2017.10.04.02.16.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2017 02:16:54 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 04 Oct 2017 19:46:46 +1030 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties Date: Wed, 4 Oct 2017 19:46:34 +1030 Message-Id: <20171004091635.12499-2-joel@jms.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171004091635.12499-1-joel@jms.id.au> References: <20171004091635.12499-1-joel@jms.id.au> X-BeenThere: linux-aspeed@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux ASPEED SoC development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Russell King , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Errors-To: linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linux-aspeed" The watchdog bindings do not describe an interrupt property nor clock phandle, and the upstream driver never had code to use them. Drop them from the device tree. Also rename the node from wdt the more commonly used watchdog. Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-g4.dtsi | 7 ++----- arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index e455bd236798..5be2e6a39917 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -204,17 +204,14 @@ status = "disabled"; }; - wdt1: wdt@1e785000 { + wdt1: watchdog@1e785000 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785000 0x1c>; - interrupts = <27>; }; - wdt2: wdt@1e785020 { + wdt2: watchdog@1e785020 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785020 0x1c>; - interrupts = <27>; - clocks = <&clk_apb>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 77dded187d5a..71e1264b81aa 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -248,20 +248,18 @@ status = "disabled"; }; - wdt1: wdt@1e785000 { + wdt1: watchdog@1e785000 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785000 0x20>; - interrupts = <27>; }; - wdt2: wdt@1e785020 { + wdt2: watchdog@1e785020 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785020 0x20>; - interrupts = <27>; status = "disabled"; }; - wdt3: wdt@1e785040 { + wdt3: watchdog@1e785040 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785040 0x20>; status = "disabled";