From patchwork Thu May 18 20:17:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 100126 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp6258qge; Thu, 18 May 2017 13:18:12 -0700 (PDT) X-Received: by 10.84.233.136 with SMTP id l8mr7135242plk.169.1495138692279; Thu, 18 May 2017 13:18:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495138692; cv=none; d=google.com; s=arc-20160816; b=aa/Qc0dp3L/9hm714ZltBhCjuBGu3HYGREGw/XQStDmSbOCK7bqdUmVs48Y1M/VB+l Fl4ULjIUIVjE9bH4yUQlYFtSjK7Zj9zVIDILuZ+HOCLWVFDo8aeBFgmJUjkepRTEPXwp y7cUsotx3aIohNSjDAeZGRPHBT1pm19g3D+kgJtdnsUGBpEke5WBNFm6Cpc2v74TAZmK t8MMAx+d2QufRS1qAd1iYqdAwoSXcXTUt+fG1pNYnzfAgI3qJ6RVFalLyzSRyBLQClqM AYZG99naApj/l5J9plsPCnHr7Fm6IiobJNwwDq/+86Mv9uJ3EizmMUT2hnj0cVElsKfe eP/w== 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=Kaua6rsUJY/iLiGOrQwCcbKInAvi9J1tZHeMkR2P2uc=; b=RrMxehUzxHKtxJI2WLnOGCI4xkM8f2nqHbh6DM9YepMqJ12o7Rom1kzE3OefJqauyU hsN2mQpzK1BJgyA+MjBzlSyF5c/4NL3JLngXOe5Z/Q0ntXfPrntyS4O/T3xjDs0YqOdx RmCiBX0lPZZwqBAVu6PrG8ULw5WphDvqyuNkqyb1/MrgChIRHwDb1G1Upd+eCj0isHIS qWR17dXY3cih8tjxlS9Jr/GViyX6nEbLTh3TtI+d11OwWmAg990lIWSXHbzGM17QmvBB ++pwJOa7/HLqIgjuazuEF6/Q8959YeHjqoFGj8kXm5SuNuQvb2gfxXYcvx8l6QmK0+X0 gblQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b8si4984374ple.2.2017.05.18.13.18.11; Thu, 18 May 2017 13:18:12 -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=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755925AbdERURv (ORCPT + 25 others); Thu, 18 May 2017 16:17:51 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38649 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755695AbdERURk (ORCPT ); Thu, 18 May 2017 16:17:40 -0400 Received: by mail-wm0-f42.google.com with SMTP id v15so65053414wmv.1 for ; Thu, 18 May 2017 13:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Kaua6rsUJY/iLiGOrQwCcbKInAvi9J1tZHeMkR2P2uc=; b=ANwuRREDCb8IQ/IhybNI8y4d4GrDcQziRx1xMYUuum4UdjJDnpZdmHX3MKr4pryl96 2Ir6xPPAMSc1to+a2QNESOoiMn+ccnbtfXGuuyym7e3OhZiMuzP4m38ulJvgyja91D2y bwEbjYqQxi5LomYUJ+Hs+ezYky67tfxfGIcsQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Kaua6rsUJY/iLiGOrQwCcbKInAvi9J1tZHeMkR2P2uc=; b=Wy9wIE5IOXvInk5Ekrp36AWsKj9JrAa171j9onBk+P9emXW5rL/6pM1LM37Oqi6uWn sCQHoB7QbntN+eZXrJWTRcvS3DNaGQ6B6NQ8MzVjDAiBZUe9sbQEhPB1e0L1v4pu/v+n nTUUVPg6gC5RaVQP/vK2uksRc+0ZQcs4gZEiH5mp7h48Qe+7/8m0DQq2mEpamEBOJdXv 3B0MP+57oylXyRyes7NsDvKmAuH6eGXrQks3+7DHPWBSSLP1ri5JAqpTv5lPnr+V3zzy WKaqSG60uooSaFe2m98dkPzRDZOKMEw4dfodVJ9QnNHgot6M8t1ew0lfEYiMShNlpeLN 6i5w== X-Gm-Message-State: AODbwcDOHa2RRebWPDOljUTrRn6xMSlzyvLOFYcr/x3auyxP6LcDj6+m 0aN8Ch6lKY1dFal3 X-Received: by 10.25.158.17 with SMTP id h17mr1307468lfe.2.1495138659224; Thu, 18 May 2017 13:17:39 -0700 (PDT) Received: from fabina.bredbandsbolaget.se (c-787571d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.117.120]) by smtp.gmail.com with ESMTPSA id y1sm1103615lja.24.2017.05.18.13.17.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 May 2017 13:17:37 -0700 (PDT) From: Linus Walleij To: Daniel Lezcano , Thomas Gleixner , Joel Stanley , Jonas Jensen Cc: Janos Laube , Paulius Zaleckas , linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll , Florian Fainelli , linux-kernel@vger.kernel.org, Linus Walleij Subject: [PATCH 8/8 v2] ARM: dts: augment Moxa and Aspeed DTS for FTTMR010 Date: Thu, 18 May 2017 22:17:05 +0200 Message-Id: <20170518201705.28790-8-linus.walleij@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170518201705.28790-1-linus.walleij@linaro.org> References: <20170518201705.28790-1-linus.walleij@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This augments the Moxa Art and Aspeed device trees to: - Explicitly name the clock "PCLK" as the Faraday FTTMR010 names it. - List the Moxa timer as compatible with the Faradat FTTMR010 vanilla version. - Add a comment that the Aspeed driver is a Faraday FTTMR010 derivative. - Pass all IRQs to the timer from Aspeed: they are all there so they should be in the device tree, we only use the first one anyways. Cc: Joel Stanley Cc: Jonas Jensen Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Fix a syntax error in the g5 DTSI file. Clocksource maintainers: I will ask the ARM SoC people to merge this patch orthogonally, it is only included in this series for reference and for testing. --- arch/arm/boot/dts/aspeed-g4.dtsi | 7 +++---- arch/arm/boot/dts/aspeed-g5.dtsi | 7 +++---- arch/arm/boot/dts/moxart.dtsi | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) -- 2.9.3 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 8c6bc29eb7f6..8a04c7e2d818 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -886,13 +886,12 @@ }; timer: timer@1e782000 { + /* This timer is a Faraday FTTMR010 derivative */ compatible = "aspeed,ast2400-timer"; reg = <0x1e782000 0x90>; - // The moxart_timer driver registers only one - // interrupt and assumes it's for timer 1 - //interrupts = <16 17 18 35 36 37 38 39>; - interrupts = <16>; + interrupts = <16 17 18 35 36 37 38 39>; 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..9cffe347b828 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -993,13 +993,12 @@ }; timer: timer@1e782000 { + /* This timer is a Faraday FTTMR010 derivative */ compatible = "aspeed,ast2400-timer"; reg = <0x1e782000 0x90>; - // The moxart_timer driver registers only one - // interrupt and assumes it's for timer 1 - //interrupts = <16 17 18 35 36 37 38 39>; - interrupts = <16>; + interrupts = <16 17 18 35 36 37 38 39>; clocks = <&clk_apb>; + clock-names = "PCLK"; }; diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi index e86f8c905ac5..1f4c795d3f72 100644 --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi @@ -58,10 +58,11 @@ }; timer: timer@98400000 { - compatible = "moxa,moxart-timer"; + compatible = "moxa,moxart-timer", "faraday,fttmr010"; reg = <0x98400000 0x42>; interrupts = <19 IRQ_TYPE_EDGE_FALLING>; clocks = <&clk_apb>; + clock-names = "PCLK"; }; gpio: gpio@98700000 {