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: 114758 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2880824qgn; Wed, 4 Oct 2017 02:17:01 -0700 (PDT) X-Received: by 10.101.77.137 with SMTP id p9mr18254649pgq.88.1507108621302; Wed, 04 Oct 2017 02:17:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507108621; cv=none; d=google.com; s=arc-20160816; b=0bj9Tqlaq0Dsq95vwfh26e3YAydS0HcIe0rn9iIM12AjnotEDYsoMz1MaVsh/YoTgk 2FwvIC1s5bkI/n0V7XLaZ4iVv8Wli74dU8DL4+GM6Aux4HY0LQoR8Qnmd9lL8pV8soK5 DNqywRtHZndjR6FW6gRCzltsKhnsi441rUC1Pzf/gcPDJdNNrm1Mvf+oxnGM7QkRN57H wq72DRpWsGbh7ayI9I1qt/T4p311r7LgvaeOboRrrTVFXdHFWmAKpGBKZThd3aGWGyuh AEduVugdTOWshuivCyJOZvJDtpVkbLbaBx+7KF6PjLnc2tq2aNtnSkf2IuUvQ4NMh4Db mlCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=apOGLkA1Scfd1tzpMDGFGVNZZm7O1M2sN1tnr1ecsXY=; b=ZJQaC558qztm44glh8m1AsISg9TdysQSUp7yc2Cp+B4eNS/Pd7+55NvrIpllKPSrsN 315C00Oi2JGZGm4ik4BJxEp5feelZaHlWI53LJWB6uu7KiwJtT7isHVRScMldCqbC6H8 WS+Dt6eI3H8Qtl/u/DV+V786yRjBYQ2/P2Hg6+l/ZRWfdJV5j9IzY11UfGUJk06rkcv+ oTI2fZ/uGQOKcPx7hUsB+HBL4qVH1pU13KAeRg9pT3/hJW1IpbVpFGFyIwRjAq/JWR2K mxXKTyzNymFTRWbX162aGwBhfxwK1X/Jeb092fWNxIVHUUuo2Kxi7Ab0rUVavH7YkDe5 /65w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=qRGlirwa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h71si2016791pfh.339.2017.10.04.02.17.00; Wed, 04 Oct 2017 02:17:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=qRGlirwa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752180AbdJDJQ7 (ORCPT + 26 others); Wed, 4 Oct 2017 05:16:59 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34054 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751891AbdJDJQ4 (ORCPT ); Wed, 4 Oct 2017 05:16:56 -0400 Received: by mail-pg0-f66.google.com with SMTP id u27so12599934pgn.1; 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=MJl8+tb44/8DG/MqN4HngwOJvO4k0dhmrtfpxgrqewxJFsNEvMsxk5zDSbnoxxHjpP 5vme4phmb8KkfHkC/nOvAVxtxPyuS5mKysGu86Z9uinLrU+6byYlQ/T2rypfXUBeOd7D 4cCCuQyiozzOwL46pdJA3brYMuHC/uRMqr9UrmZalVWh6vmAZg/Bqjy+5efWPwKdkpQn Xe1BGNj2xb5eI6L9rCHeXsDdXUFENzIQHbSLGe8gilfCNSfujo8zcDgDrz6FaqwQ+SIT 9Dq+d+7f5M3OwlHN94wb7+0jJnGewNVPttg0HJMXOqqW4NrJ86vX31hKc/ITyrCvfm/O Z66g== X-Gm-Message-State: AMCzsaWOyZVoGn9bEXgMnobqn+ee1Xv/w7RKY2Ix0Xkrw4ASgKNqguwD hCN8FJJxGZThe3/nz2BVpNM= 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 Cc: Russell King , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Jeffery , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= , linux-aspeed@lists.ozlabs.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/boot/dts/aspeed-g4.dtsi | 7 ++----- arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) -- 2.14.1 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"; 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: 114759 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2880991qgn; Wed, 4 Oct 2017 02:17:10 -0700 (PDT) X-Received: by 10.99.63.199 with SMTP id m190mr13093292pga.239.1507108630844; Wed, 04 Oct 2017 02:17:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507108630; cv=none; d=google.com; s=arc-20160816; b=Cv72veOoiAehH9tg6X5V1GTrNhefZmGurRWZ0clbySxE5UgaRh2AKOAer7WsOMk3ZQ d/CloLr/dnkHZi2HwvCwzhxIviX/ydNWSSui4S+CAd9VmThqLFQB3Uoa26DjizNO7gon u4DuNSJZ42shrr+gYwKpgFgzQGyQO7zFRATFqVSnoC3HI4FVmYhREPSgxogP/wwuiiC1 tC6w4JuK+mbOx2g5tFxyi0lILaJM9kCk5yb0mf2BvyrAmLsbO2dLc/YGrcSJLKhtyRQK bwMLhsHxz1Xc5M8vxkHgbpqphAZIYkRMQV1tMFxadqr1SdyvXLPvMzRDgelc9FjgUZcT 318g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=l+Ahc854gyqpa6yx35/cdplSw0nR1qLSEXL8SddYkZc=; b=bFoMNcTrl9ycpVnYzozMNXAewAE0P1uD9U1g/h0TDo9PwkbVi41PVGgU7ErHE1/EMD Mm8BGpH/jr2nn9b6RjbLMHFDvVLKTumI4LcBVspR2e2/4TFQJD7nc+JFZ/H1AFTnoqk3 U1s26EiaMYJye6xGvNn2IvYc2gOeFYBM/DeYMDI+JlQSldDeZZzvxuWehh0JlP/I8pwp 1Klwflcj/SkJoyUhWmqO2WZ4nNT25v4WHl+rF1dFPjjTjINkIZSc2KE0rdanHhjlVbZl sSFqjeV1otlJN9A8VNsKle95PM7kD+S8uDqXL4msxrO4Fy22kq+VNsvR6mgu6B87ZyOi Yxow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=QJV06cq6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h71si2016791pfh.339.2017.10.04.02.17.10; Wed, 04 Oct 2017 02:17:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=QJV06cq6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752213AbdJDJRJ (ORCPT + 26 others); Wed, 4 Oct 2017 05:17:09 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33131 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751891AbdJDJRG (ORCPT ); Wed, 4 Oct 2017 05:17:06 -0400 Received: by mail-pf0-f196.google.com with SMTP id m28so11719914pfi.0; 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=bw7sPV/QoAbJaCzFV+bGQayswVAVvcIyZ0HUkgvf+nIEcpn8lFqgf+rwBba3uQemYP rJOg30IWHSvoYYac2l+HiPQ/TbH+PtrNG/2YW60pTtp0fiXJ+PWBRyFsZKdTMYYpA4CV G6TBTwT+hF1dMb1qyNsE7KhTU9uw9QL9N0Yrzd8Zdwz+OKjRtHHJXO/jtuwFl+Jg3Mf2 71izxSCwOx0EKFZ2AA6KV4U6OgRQLNGT9lgsRCFufrbw5+OEwFxt6nIuuFhjAqaJFnEg OpISB3HWz68+oUg/RtMIzAXq0p7bw1IeuYSPCcFqCJvd4DUFS957nSi5k6zqUFYKtZyl ygkw== X-Gm-Message-State: AHPjjUgJdA51SKIB7ctUlZ/O9YJ68JRtenIQWEZJ26RIwla7XkswT3am PgS+pobVbvc2NS9ik3Ty2fM= 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 Cc: Russell King , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Andrew Jeffery , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= , linux-aspeed@lists.ozlabs.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/boot/dts/aspeed-g4.dtsi | 1 - arch/arm/boot/dts/aspeed-g5.dtsi | 1 - 2 files changed, 2 deletions(-) -- 2.14.1 Reviewed-by: Andrew Jeffery 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 {