From patchwork Wed Oct 4 09:16:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 9984095 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 BF2FE602B8 for ; Wed, 4 Oct 2017 09:29:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B14DD2877C for ; Wed, 4 Oct 2017 09:29:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6388288AF; Wed, 4 Oct 2017 09:29:48 +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 5612E2877C for ; Wed, 4 Oct 2017 09:29:48 +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=fs9PSvCMM4FXCmxUjtZFUXuwUssjjDl1ExLgX52tIUU=; b=DV73UQ/19Ztzp+5S5cppVUSwkG CFdqNnfGGYNRfN608bULQU19s9o5PHjM4S7vm4YjWYz1tH+1Usnj902Frv7XMnz4m6/I3iof43DMT SIbugk1ddt6SfyUMCsI9CKVwSSZq1TJwHIFWF/aicMBMETXlqvFMTEhzR5vFBBhwIDCQw04Lt1gzL a9NNcGsHPJEltjvA3kbXaEIdHeBLYjGb2nQG1ck0MTbq+tK3lOfKfuupZyX1JNxVF5dbgNsdItKnt CfoEQ0v6KAFs28XlfkOhv6WtaDx8+ENXeXKTwGcJ0yOLgTv4hRkQ09IS89TLknX2EBBs1E9C9DH5l 1HKUk1dQ==; 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 1dzfzv-0000Pb-Jl; Wed, 04 Oct 2017 09:29:47 +0000 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dzfnz-00028q-2b for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2017 09:17:32 +0000 Received: by mail-pf0-x243.google.com with SMTP id e69so11841286pfg.4 for ; Wed, 04 Oct 2017 02:17:06 -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=l+Ahc854gyqpa6yx35/cdplSw0nR1qLSEXL8SddYkZc=; b=QJV06cq6O+2JmiKPer3JDY7ri2VtJmRs2fYRczH/S90pu3VCqryH0HMwfHtSawR8XQ DgkK4/wULoAfQsrhdTQ7n9nTtRwuBHS4QjQrD83062c8Z03LqRFuVJ6+/8cYiXfZyuHc EEHwOe5zPqCparEKP0H6pkrbHfNCz//LiHu4trDqmS0W0b9/9BV3RzTG9OVnzCwNpNNI l3Ww0z1VhKGJlYfEZEKsX/YyhWDLP4HrmQpf4kwd8mglvktEE/0vaRhs7iydoglpeLQg 2m7ysfPKP84T/bmvD7UAxUt9x/6IpAjonr8IVym7xKIiaFfb2WY9pfbcU71T5PlTJava jOmg== 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=l+Ahc854gyqpa6yx35/cdplSw0nR1qLSEXL8SddYkZc=; b=nh1dUnoUsvMilV97gnc8HoJ6P42P84aUH4Niack4rfKvDhHXTxPv9G8ykyHGpre8/F mEZXdx7wQxKPGghDk4EgKAgZyxdVmBlwL1cNRDB3VRT3Jy+9r+fEYze3ShAdwxqP+3Nl p1E+VuvnPNuaXnwaU4isa3/XfB0GfDorXHGb3K60WDBC06hD5cmz/rGB5msrHHrUU+0x idlgpydP69cL1wpSRM6511vsn+pB0+KyTOXfrPyqxhdUHduS62/siGNRFa7IihqQ+nmR b4a6raa2sewh8FZyJBEy2F/qhWeG/QDRapHw/P2phZOuZcRwqvWzjGHtqGT3oAmjCeTS 0+cg== X-Gm-Message-State: AHPjjUgJ9JkfYKbBDEveDrXdXlxE9uMrl875gEJfDLc1kGIJaFtkeT3x 45d7c0+IBYV3Tu79ezZN+Ps= X-Google-Smtp-Source: AOwi7QB7IVQNcUZa0dtCw97P7PMAeMNypSC1zs07FIB/Y4/aQ1ckDCiy86/XzamCPkyoeOkZCuya4A== X-Received: by 10.99.110.141 with SMTP id j135mr18166154pgc.242.1507108626200; Wed, 04 Oct 2017 02:17:06 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id j14sm24143696pff.59.2017.10.04.02.16.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Oct 2017 02:17:04 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 04 Oct 2017 19:46:56 +1030 From: Joel Stanley To: Joel Stanley , Rob Herring , Mark Rutland Subject: [PATCH 2/2] ARM: dts: aspeed: Enable watchdog two Date: Wed, 4 Oct 2017 19:46:35 +1030 Message-Id: <20171004091635.12499-3-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_021727_906954_CD3799A1 X-CRM114-Status: GOOD ( 10.72 ) 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 second watchdog is left running by u-boot in the common configurations of the firmware shipped on ASPEED boards. Ensure a driver is loaded so the system can succcessfully boot. Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-g4.dtsi | 1 - arch/arm/boot/dts/aspeed-g5.dtsi | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 5be2e6a39917..9bf84d2ba038 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -212,7 +212,6 @@ wdt2: watchdog@1e785020 { compatible = "aspeed,ast2400-wdt"; reg = <0x1e785020 0x1c>; - status = "disabled"; }; vuart: serial@1e787000 { diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 71e1264b81aa..ca023e9ab0b8 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -256,7 +256,6 @@ wdt2: watchdog@1e785020 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785020 0x20>; - status = "disabled"; }; wdt3: watchdog@1e785040 {