From patchwork Tue Jun 23 19:52:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223076 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A55AC433E1 for ; Tue, 23 Jun 2020 21:39:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1DD4206E2 for ; Tue, 23 Jun 2020 21:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592948344; bh=ueD/RWnrVuFLiZpwezRind7Dz5DA82UAx5nFS5ynmqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IqLiAIBwqv/jd7jmqc0zY4UJIE3wGON+5WR/n2jWSGlpEE2PZe/zudn3NCF4rXQtw PSNTOUJiVVhAdFfO8IkomWCMUhVvA/+T8SDXNbjkLE1bN/gkkcsDjRaJiHYP8o07Ro 0mnbtcJl4gQpKdm93odHMALGlYajDAUfL54ZnH4c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390399AbgFWVi6 (ORCPT ); Tue, 23 Jun 2020 17:38:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:48228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388145AbgFWUHe (ORCPT ); Tue, 23 Jun 2020 16:07:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1290D206C3; Tue, 23 Jun 2020 20:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942854; bh=ueD/RWnrVuFLiZpwezRind7Dz5DA82UAx5nFS5ynmqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SBhnAGt2xXqe8FGGpOh455x6f/HNmefOfLHkYdgHUSn5l19gBLWQjOsPPNYeR+mgw hb4sJ61+3IxufJEZWUjJN+A70wCQ2I/fD+FRzk14fdbnjlGJ48tKFwnh2SB49FiVCm 3gx8XzJPO5pv6k6ZXvILWMPuLhqZDlb01d/3a8Ck= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eddie James , Joel Stanley , Sasha Levin Subject: [PATCH 5.7 161/477] ARM: dts: aspeed: ast2600: Set arch timer always-on Date: Tue, 23 Jun 2020 21:52:38 +0200 Message-Id: <20200623195415.211096698@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eddie James [ Upstream commit c998f40f2ae6a48e93206e2c1ea0691479989611 ] According to ASPEED, FTTMR010 is not intended to be used in the AST2600. The arch timer should be used, but Linux doesn't enable high-res timers without being assured that the arch timer is always on, so set that property in the devicetree. The FTTMR010 device is described by set to disabled. This fixes highres timer support for AST2600. Fixes: 2ca5646b5c2f ("ARM: dts: aspeed: Add AST2600 and EVB") Signed-off-by: Eddie James Reviewed-by: Joel Stanley Signed-off-by: Joel Stanley Signed-off-by: Sasha Levin --- arch/arm/boot/dts/aspeed-g6.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 0a29b3b57a9dc..fd0e483737a0f 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -65,6 +65,7 @@ ; clocks = <&syscon ASPEED_CLK_HPLL>; arm,cpu-registers-not-fw-configured; + always-on; }; ahb { @@ -368,6 +369,7 @@ <&gic GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; clocks = <&syscon ASPEED_CLK_APB1>; clock-names = "PCLK"; + status = "disabled"; }; uart1: serial@1e783000 {