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: 9984079 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9DB03602B8 for ; Wed, 4 Oct 2017 09:17:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FA6C27FA8 for ; Wed, 4 Oct 2017 09:17:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8458C28789; Wed, 4 Oct 2017 09:17:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D62D127FA8 for ; Wed, 4 Oct 2017 09:17:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=FaMkSk8CGxSLNXNG+B4nuri01mHaPre1DdThF4S097U=; b=q0hLUtxF50uAQ22T+ni1p9pYoB xb3akyAGEL+FQL90EcyJ35c7x87tZ+v0Y57ZPRrZB4gmsE99TBRoZnjpeUMxc4hDCgEbzpQlg+8U4 oJWZdvRjD1OWqV+cixo4Mqpl+6Knr6+6OR57Gj+u23FJQhlfwb4Z6FMoctgjoM9veShbNasj+BFwP IkfkN1Skqufoqhcn8du1tXYIUeO/mRUugVNeLLi4KtQTeyTU5OnHICCYS3YloLVu5nUrMgTPCVpID Y5Hz2Va/H7GujP4ZkbAHpoRC2lQPZC9LwYrp8zFx2ry9wlfnFDyms73j8tHjaS2C3eyETakGt0hsI llZ665Gg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dzfo3-0002Wd-Dl; Wed, 04 Oct 2017 09:17:31 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzfnj-00026y-TP for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 09:17:14 +0000 Received: by mail-pg0-x243.google.com with SMTP id o1so11454002pga.4 for ; Wed, 04 Oct 2017 02:16:55 -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=S6QfloZgVdGhaeuw9sUF9YUE0ptSf4ZHZZtz0fQ4zdiYYTVOa9MgeJhlzWFxhO61kc bj7scNTJ4A6CumBAplCgiUbg668W0+PEm5N8mLTdEgQ/7ttxMXrubA3wsqFP6xF2bFPL dUo6IblF91DlTExQODKUmqzGroLype3PM+/2B2QTo9cAniogIQvRChZVwiBGQ78xdv8c jRhyn63YdL4wQ+qmHfSPTDmO+NrxHUNifDiDnYhuve5ylWKTA8QRZiRyJ4WmHtDYNP+T VbWWAO1HL7/Opy7mmglyvfhU7dGJsNRx1jjzP736lZjeKPxgBsaXD1ZrZHPimkCVntyO XwnQ== X-Gm-Message-State: AMCzsaUXAwgWmF89qMbxHqUVbIGHGH8pXp0lX0cXiZGMXaKP0wxo6xwb FT6/uR6lTNXN5P0euQ3nb3Y= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171004_021712_097113_543A3A73 X-CRM114-Status: GOOD ( 10.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery , Russell King , linux-kernel@vger.kernel.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , 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-Virus-Scanned: ClamAV using ClamSMTP 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";