From patchwork Fri Nov 16 20:42:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10687011 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B142517DE for ; Fri, 16 Nov 2018 20:43:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A13942D83C for ; Fri, 16 Nov 2018 20:43:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9211E2D842; Fri, 16 Nov 2018 20:43:24 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 4C80F2D842 for ; Fri, 16 Nov 2018 20:43:24 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=OnhlvA1heSBpESgev55NKkS9Plnska0fe8xWOv+7obg=; b=h0TLATFRanGYAe CUPu/L8sjJJQppzAGDTc5oCGDQp4xBJEP0sD3GwmvHIbsreWdAQXIl/6jfLjF6xRjClogAZjboHJJ qM6UgngCjAy0+65FejJQqjasPam3R/d2tISJRpDo7LmEK+h+ylY+BM2SySqBhuFguR0rwE2qg3ROR 8KWRQleZYby2lRVVPlEs+DuKAksksktctmKuaVfrQDcKAu7Jd6UOGswJgOSN3iFMMg9jecHqlUr/p o9zZxckQIupR4cQStc8DcF61x7jXIa4gnH0nCUXT5pyNCPBc4b4uIdfArswUQFXB8n/cK2Q8+7q/7 Lr3sJsz2XRI2/03OQ+Hg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNkxU-0003HP-JA; Fri, 16 Nov 2018 20:43:20 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNkxG-00031z-Df; Fri, 16 Nov 2018 20:43:07 +0000 Received: by mail-wr1-x436.google.com with SMTP id u9-v6so26151345wrr.0; Fri, 16 Nov 2018 12:42:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dm8SNVlCKr6Ckk9KEr1fcnOwJc1nkaFN9aiZa/NAWns=; b=n0vakKaeLfRNTnvkh1725cuKfcGsdsQ8eCTaqwwAeAn/l8ichnG+1UZcdX+RnMYmFo 2odMCxLxv1HJYqxTgGXsis1Qyj4n0AE3Dd8t3qGc2xWpWJzO+5gzNW4W4gZR7UG7ph7x Guz0pI3ZSHi6v9IfJSI/JQl9tw8nk25V3R114E/6lZlan0M3bE8NcwQNjS4ClzxErNE+ m2PvJFPqF77YQyTdqXnUk54i2/yWLGYcQkssDhj0HaOIpMaN9q0xRVEs1AKe3l/T+Nj/ wJMPGsBXiaF6yvP9tk/XVD35uuXmhloWaswCFC/IvnnFDh7GVoeVvlq0WYtxe3ZUMVgy yNAQ== 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:mime-version:content-transfer-encoding; bh=Dm8SNVlCKr6Ckk9KEr1fcnOwJc1nkaFN9aiZa/NAWns=; b=szlLnS/32v88UTeunK8Bl6JyG+6prX4AqvVxzW4Bgu77JlX0u77zbrVohhTFwFbIw2 fB3p+qWaM+VOXcNmDPr+d/gBY/5lmVyDWFOxduGDEeqBQqj5M4LJjCJNvmc335XWxX+I 28xCAFeote435m3PnLBwopvokwXyK8G3IXWmjzQSInos1wpG6dBBNw7QjqODTf8mgi6E 0Jh8QQ0MeDV+qi9JqSDNcMlBDovVVyq8w/5PDEp1iu6x+Rw0fl2NDmWZpeALj+fkZzdm yFFz+qczAjv71hgtZQxKl4YkzZO9i/ALQX1GjbXroztcjH8bvKNrhxqWlZ7cuNUEW9xr xAkA== X-Gm-Message-State: AGRZ1gJYZz7vuk8Y6TmT209PUUong23oCVU3tl7quJ207jXX/yk7E7aU pI+rOhyf84dhHmRpLNNT4+40oqMM X-Google-Smtp-Source: AJdET5eetc0Jv7+B260nnIE+S093nFg3vWG3xA2cVbJuLrntqL40aCucbUbCNkcH+27Ty7BKezNnCw== X-Received: by 2002:adf:aa94:: with SMTP id h20-v6mr9201219wrc.216.1542400974323; Fri, 16 Nov 2018 12:42:54 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD717A1006D214A3B023844E6.dip0.t-ipconnect.de. [2003:dc:d717:a100:6d21:4a3b:238:44e6]) by smtp.googlemail.com with ESMTPSA id y34sm6000758wrd.68.2018.11.16.12.42.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 12:42:53 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH 1/2] ARM: dts: meson: add the TIMER B/C/D interrupts Date: Fri, 16 Nov 2018 21:42:34 +0100 Message-Id: <20181116204235.3925-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181116204235.3925-1-martin.blumenstingl@googlemail.com> References: <20181116204235.3925-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181116_124306_456449_BAEA21C9 X-CRM114-Status: GOOD ( 10.87 ) 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: Martin Blumenstingl , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 timer on Meson6/Meson8/Meson8b SoCs has four internal timer events. For each of these a separate interrupt exists. Pass these interrupts to allow using the timers other than TIMER A. Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 0d9faf1a51ea..f0255450bcb2 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -200,7 +200,10 @@ timer@9940 { compatible = "amlogic,meson6-timer"; reg = <0x9940 0x18>; - interrupts = ; + interrupts = , + , + , + ; }; }; From patchwork Fri Nov 16 20:42:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10687015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E43513B5 for ; Fri, 16 Nov 2018 20:43:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A8412872E for ; Fri, 16 Nov 2018 20:43:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D16128757; Fri, 16 Nov 2018 20:43:50 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 B31762872E for ; Fri, 16 Nov 2018 20:43:49 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=1lRX0e9uot5YCmSQXqoITOPfFE/4nSkt3kO1iKoL2is=; b=uu31rO6ecJBulM 4tzUGPMFLYcpzSgXTeSZAJyrbUMqfptZvdxSv8N1ehvX0Rm4yyStsXJ4b5row3GpRGzir5F3nrMgH CmlR8HCUck8gECrl5QhxfVSNQ/9I2mQr/ptSl0wX3qinlJfq9HnuydpJPOZFlBvnKTiDOmsuNasW2 H2G0J3dHP2GFBXLJeLCdGIAdmCvNDVr+lUPgZFSs46I7nP/NN7RicWt+pWFn7pBpD0NBWt1XjeOdn rNz4ANv/VlVknswBj9ldJ+2U8F/d0t9EaDuZmVZEi8wEySkZpO7CxqQtKwf+NWxUF+BLC1fCdThdz ijMcRUv5zQ3dQshvEJRA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNkxj-0003um-Nd; Fri, 16 Nov 2018 20:43:35 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNkxH-000320-Lx; Fri, 16 Nov 2018 20:43:09 +0000 Received: by mail-wm1-x342.google.com with SMTP id u13-v6so22265015wmc.4; Fri, 16 Nov 2018 12:42:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ai/RSMltyx36GwmePMBYxsJgS0XIqXO//01v9qXa8/g=; b=ksJ0d3iE7L68tClLdPRFoJ2vvf7CtBbXhEUQt/r4BUSV3UpK1sotyEznR20vDuQS+R in3Rjlcdremsy/lfuaQH8pNt4fLh5Ug9d9vJGS9FmLhMnqfhxaEcIGzrNoyDBgECU6dx bk3gV2vcDJGHYDJK2jEh+Oii0CApDkb9t9OhezliKs9r0u/C5mlw75kf3wRHPrGKE/oi uBpzznqaU8n1nVCc/eLIAWP/IOKKWIUGr6v02xRyV2LishqDBYG2z/GO70xhz2ueFjv1 r7evxNe9yKlTPdcdCrDJfM+b6EtK6LvXrl0soBwa8mha5FNdEOTOOzdUGLaQCXov+yET i9Zg== 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:mime-version:content-transfer-encoding; bh=ai/RSMltyx36GwmePMBYxsJgS0XIqXO//01v9qXa8/g=; b=Odkhnam2pcJsdoom5oIOH4qqp4xCM0w/RkKp91X/kw/3GfuNgMBB6rfIu+UvV4jh4x sJCrk/gobpT4L+TgXERPa/NHBzTanPdwHTp6Hp53WcYYjaxRar9a7apwcbtEZohcBDsC nxmRwUoy4aE7Vf2j8Z4/tAcNn1MMp3GXLRhx+JjdEYvJU9qdQouyMq1CVgd9ww8xBTLU zk7ER6iokrCwEsiK6caxvvsYYAUd7B9e0Rgo4hKWrKFDUzb0H0Y7mOSt09dw2KZYsVXG P2FBHDFEfCGGGbyP0c8S8dHyyngl9FfUlfCrQ0oP9hGvc02YFnc6hvl9z8l/GV2Rmm8h 5OLg== X-Gm-Message-State: AGRZ1gK/b+MB8vKHuEjQxLeXupJS9bQIcINBpwHQmyx44wPkA89Akolb n4bg83fotpR9+S5qeVBCvzX9RQdy X-Google-Smtp-Source: AJdET5dkG1uD6mpkxNZZQmZ6X0Dfch11XWq29CVOLJ3p+eB9T8/ydohsOOc86PzaIPye4DDcXPIZmQ== X-Received: by 2002:a1c:880e:: with SMTP id k14-v6mr9967168wmd.88.1542400975598; Fri, 16 Nov 2018 12:42:55 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD717A1006D214A3B023844E6.dip0.t-ipconnect.de. [2003:dc:d717:a100:6d21:4a3b:238:44e6]) by smtp.googlemail.com with ESMTPSA id y34sm6000758wrd.68.2018.11.16.12.42.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Nov 2018 12:42:54 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH 2/2] ARM: dts: meson: add the clock inputs for the Meson timer Date: Fri, 16 Nov 2018 21:42:35 +0100 Message-Id: <20181116204235.3925-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181116204235.3925-1-martin.blumenstingl@googlemail.com> References: <20181116204235.3925-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181116_124307_714207_556F8577 X-CRM114-Status: GOOD ( 14.00 ) 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: Martin Blumenstingl , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Meson Timer IP block has two clock inputs: - clk81 for using the system clock as timebase - xtal for a timebase with 1us, 10us, 100us and 1ms resolution The clocksource driver does not use these yet, but it's still a good idea to add them as this describes how the hardware actually works internally. Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson.dtsi | 2 +- arch/arm/boot/dts/meson6.dtsi | 5 +++++ arch/arm/boot/dts/meson8.dtsi | 5 +++++ arch/arm/boot/dts/meson8b.dtsi | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index f0255450bcb2..0839da07a75c 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -197,7 +197,7 @@ interrupts = ; }; - timer@9940 { + timer_abcde: timer@9940 { compatible = "amlogic,meson6-timer"; reg = <0x9940 0x18>; interrupts = , diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi index 9b463211339f..ca978ab952cd 100644 --- a/arch/arm/boot/dts/meson6.dtsi +++ b/arch/arm/boot/dts/meson6.dtsi @@ -88,6 +88,11 @@ status = "disabled"; }; +&timer_abcde { + clocks = <&xtal>, <&clk81>; + clock-names = "xtal", "pclk"; +}; + &uart_AO { clocks = <&xtal>, <&clk81>, <&clk81>; clock-names = "xtal", "pclk", "baud"; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 08c54cf5420a..3be5fbd07997 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -387,6 +387,11 @@ clocks = <&clkc CLKID_CLK81>; }; +&timer_abcde { + clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk"; +}; + &uart_AO { compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>; diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 46b3564a6536..587a855f872b 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -370,6 +370,11 @@ clock-names = "core", "clkin"; }; +&timer_abcde { + clocks = <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk"; +}; + &uart_AO { compatible = "amlogic,meson8b-uart", "amlogic,meson-uart"; clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_XTAL>, <&clkc CLKID_CLK81>;