From patchwork Mon Jun 5 07:48:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jeffery X-Patchwork-Id: 9765667 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 69ADD60364 for ; Mon, 5 Jun 2017 07:49:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B43922B39 for ; Mon, 5 Jun 2017 07:49:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F7D92623C; Mon, 5 Jun 2017 07:49:52 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID 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 D13B222B39 for ; Mon, 5 Jun 2017 07:49:51 +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: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:In-Reply-To: References:List-Owner; bh=EvKh0osD2wI3PY5lYAA/N0OhnuISk83VBWXqt5YOGhw=; b=E5n 3Vz3DXzARBU4b1AD26X+WeyP0+IPOQKOCbsg9p/qjwLxaQiKWoDBfSpu1x7+lx/GtLfCdn6KVhfcO nYu8Fd4mPKpLavdHdJG+H5NqWYuBZvl26ZMSvzdrYnd/sMccZoTrFCzj/x9kypxG54KKTbjaVpoPN jGwogt9oiB5kD1PERCR1m8vFde73ExFjluacJz0+XWwewo1BG80VpLsnyQXHk6GsAEJdn+1QMmiKu psdFb+gMiBrXCKi3KyMbEdZ9spHhQUrOBwk3CG+JIAXU+RNwbU0vpNqQcspIZYB1c0DJz4CM0Fixa zS5vlyz7V1Bzq44rXc+XXLd/RvirR0A==; 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 1dHmlq-0002MU-Up; Mon, 05 Jun 2017 07:49:50 +0000 Received: from out1-smtp.messagingengine.com ([66.111.4.25]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dHmln-0002Kz-JD for linux-arm-kernel@lists.infradead.org; Mon, 05 Jun 2017 07:49:49 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D5C2B209AA; Mon, 5 Jun 2017 03:49:23 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Mon, 05 Jun 2017 03:49:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aj.id.au; h=cc :date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=fm1; bh=DEjDYvN9fKg0BQjJbqRmmOFaplJGjg +5SCtgmfV8adg=; b=R5qwuafu+ulCaZd8/U7eUAz60vvxQqXoH+riO/v83PV2jT mJrlLQKqiz9inwgN+rakZj5RiG6Sj3RQvE6IyaZ6QbRUsWjKlGNzy5Gx3kfVma+G /OwnpDuMgBM0z/iATzgJV2McXiPSaqWL07/tl9st+zDy6cpJ2MTVtm5BkUNAQUUR dXVPRBeb8XpWsuC6iM8ciochdTZ0VePM/aL9mHiwpWAgEhMX231VHyPAuM/CUNtM PofC6Q8qLX4PjfGXCmDLxoJzQNI6Dr0LmTlPg8yAjNOV+AIrsNrGmxmSDOslrYwf ydaOjM4FYpZIY4YQ028DIRrBKunhhPhgGe7/t1Ng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=DEjDYv N9fKg0BQjJbqRmmOFaplJGjg+5SCtgmfV8adg=; b=ibqkgh+862PePMZd004UaR tV592z0B0ZVnuzItbXgN4nADs7d0hinnQM3xB+KAjlDg53XYECl/jdPwoHE3+sfa YcIIJYctPI6kGkHwBKcm0duDEu2Zdb7nBn0tFPOBHPiTU8BZq2vTPbanqAG9uhs/ yYGUYXJ3WockT79FcIcMHR2TGaa6txssRdSckZBr+nkq/Knr0ybEsAD1hY22e4lw 35xvRR0x++ZMKt4f+BpuYRnbits2FP5RBQek3Pc/QZpaUjHbS5PDMNJNIES6Bbff 1RocYvhB3TRf/Xkmjf0rTi33GQ58dv7CsrUn9P1QpyTR7rcZ5VLxzuYIYShXKCUQ == X-ME-Sender: X-Sasl-enc: EoZ4+1WDdBrMe9e8abDKhWhfKvL17nyZYn840Ojm1wAj 1496648962 Received: from keelia.base64.com.au (unknown [203.0.153.9]) by mail.messagingengine.com (Postfix) with ESMTPA id C80F37E545; Mon, 5 Jun 2017 03:49:20 -0400 (EDT) From: Andrew Jeffery To: joel@jms.id.au Subject: [PATCH] arm: aspeed: Add clock-names property to timer node Date: Mon, 5 Jun 2017 17:18:46 +0930 Message-Id: <20170605074846.30925-1-andrew@aj.id.au> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170605_004947_716548_7F8956B7 X-CRM114-Status: UNSURE ( 6.71 ) X-CRM114-Notice: Please train this message. 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: arnd@arndb.de, Andrew Jeffery , linus.walleij@linaro.org, daniel.lezcano@linaro.org, linux-kernel@vger.kernel.org, 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 merging of a number of clocksource drivers into fttmr010 means we require clock-names to be specified in the Aspeed timer node, else the clocksource fails to probe and boot hangs. Signed-off-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-g4.dtsi | 1 + arch/arm/boot/dts/aspeed-g5.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 8c6bc29eb7f6..3e74929d3289 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -893,6 +893,7 @@ //interrupts = <16 17 18 35 36 37 38 39>; interrupts = <16>; clocks = <&clk_apb>; + clock-names = "PCLK"; }; wdt1: wdt@1e785000 { diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index a0bea4a6ec77..1e6c701da853 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -1000,6 +1000,7 @@ //interrupts = <16 17 18 35 36 37 38 39>; interrupts = <16>; clocks = <&clk_apb>; + clock-names = "PCLK"; };