From patchwork Wed Sep 5 20:30:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10589401 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 31C9813AC for ; Wed, 5 Sep 2018 20:30:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 216152ABC8 for ; Wed, 5 Sep 2018 20:30:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FA272AC15; Wed, 5 Sep 2018 20:30:37 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBADD2ABF8 for ; Wed, 5 Sep 2018 20:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727599AbeIFBCZ (ORCPT ); Wed, 5 Sep 2018 21:02:25 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:45467 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727674AbeIFBCZ (ORCPT ); Wed, 5 Sep 2018 21:02:25 -0400 Received: by mail-lf1-f65.google.com with SMTP id r4-v6so7087014lff.12 for ; Wed, 05 Sep 2018 13:30:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=SAdPfgLjPz8AqM85Yp+ZaTsPpn4YjI2d/b4CafRK6GU=; b=JA+zXwRaHB6/u5C/0KGpCCg8Z4cc3PgvhdK9gdhwCYriKFjE3R6am2qWukIxB+9+2V dy9GCn7ic/OoUEmAO0LBU/kbWkmRAyQ8a3Jdr6hxRHtvYYriZkUYkKKTN3G0tnUU59ys fQkjgTMwy/Co6R5/GD2WMby2Cuia6rAT3dJYZN1P+gRwPcht68/kOECrKk2+GIbOdAEG ubEkShiB4Tj17ehU140r44IP5thtEvQykV/dg8XM55nhO8fMSq52XCK7ALGjrMQUfYyO AmgENNMn1FTHLz8y1cBqJhUCvNzvmCIjzj8OWuGL83CDsy/Q4J8O+jmer08XiOYrCMtt ZLew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=SAdPfgLjPz8AqM85Yp+ZaTsPpn4YjI2d/b4CafRK6GU=; b=LZfnzZpvV7z9alG5bvUgcDG1v5kbcmpBOgUfmR0I6IeBf01/p4zecY6g03TFAr7ceI mACqU7TkgrlfpEFyar5/CSYtBlQPMWND3TsSPoRfZun7NQJ2FB/SQikbWZCIgyvMqEZX zJ2M5ki1CGH5gZdqb+MAHRD1kGBHUJ3BNyqHIKCob4Oia4CvoBvpXW3LoAz9QlkSGGNn P+BSeVCuMGY7r4XSUJvBNgzRj8/J5DivekdCER0jpJtA5D1qBcGJx8v3I4d1LSM1I40a SC+I3FCy3KvG+CCzMTCDtHSlWolB9ktVwrpnQ9+CoIpni6DZcQ/zbP6KHBivSda6v1A4 NPlQ== X-Gm-Message-State: APzg51C07AhqKEOl+ZgDAb1HC+F5Wz8DT4mZ7orva/LPA373bjqOXRhb jOOGL1uzH5egzJSx/YWXsBrtzketNWk= X-Google-Smtp-Source: ANB0Vda28HTOO/GtywLwUaaal6yyuU5oc4VlftjtSPASwvSStTYCrMf900tC2LeyIKKPnDeU3I3oUA== X-Received: by 2002:a19:290c:: with SMTP id p12-v6mr24348973lfp.124.1536179434062; Wed, 05 Sep 2018 13:30:34 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.86.228]) by smtp.gmail.com with ESMTPSA id o11-v6sm461240lfl.1.2018.09.05.13.30.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 13:30:33 -0700 (PDT) Subject: [PATCH 1/2] clocksource: sh_cmt: properly line-wrap sh_cmt_of_table[] initializer From: Sergei Shtylyov To: Daniel Lezcano , Thomas Gleixner Cc: linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org References: <3ce24bfe-1edb-1a92-8847-ff998ac86d16@cogentembedded.com> Organization: Cogent Embedded Message-ID: Date: Wed, 5 Sep 2018 23:30:32 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <3ce24bfe-1edb-1a92-8847-ff998ac86d16@cogentembedded.com> Content-Language: en-MW Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There's no good reason for the sh_cmt_of_table[] initializer to violate the 80-column limit, especially after the commit 8d50e9476bb4 ("clocksource/drivers/sh_cmt: Mark "renesas,cmt-48-gen2" deprecated") partially fixed it -- fix the R-Car gen2 related entries as well. Signed-off-by: Sergei Shtylyov Reviewed-by: Chris Paterson Reviewed-by: Geert Uytterhoeven --- drivers/clocksource/sh_cmt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) Index: renesas/drivers/clocksource/sh_cmt.c =================================================================== --- renesas.orig/drivers/clocksource/sh_cmt.c +++ renesas/drivers/clocksource/sh_cmt.c @@ -937,8 +937,14 @@ static const struct of_device_id sh_cmt_ .compatible = "renesas,cmt-48-gen2", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] }, - { .compatible = "renesas,rcar-gen2-cmt0", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] }, - { .compatible = "renesas,rcar-gen2-cmt1", .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] }, + { + .compatible = "renesas,rcar-gen2-cmt0", + .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] + }, + { + .compatible = "renesas,rcar-gen2-cmt1", + .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] + }, { } }; MODULE_DEVICE_TABLE(of, sh_cmt_of_table); From patchwork Wed Sep 5 20:32:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10589407 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 43C7B5A4 for ; Wed, 5 Sep 2018 20:32:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 368892AA16 for ; Wed, 5 Sep 2018 20:32:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A5812ABD2; Wed, 5 Sep 2018 20:32:12 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE3322ABAE for ; Wed, 5 Sep 2018 20:32:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727758AbeIFBEB (ORCPT ); Wed, 5 Sep 2018 21:04:01 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:45752 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727840AbeIFBEB (ORCPT ); Wed, 5 Sep 2018 21:04:01 -0400 Received: by mail-lj1-f196.google.com with SMTP id u83-v6so7360950lje.12 for ; Wed, 05 Sep 2018 13:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=WaLHw3zs+WM35AlU6TH2FNE8/HjATL3g2LyVL2XTN7w=; b=nPlLptsH1Em81pQKgaD6+6qqhVJ8iEx84c6BQjTkk7WOImyjd9zL18gbNnSyKiFfLm J5xfTT7aA7XrpMOmPz37F4q7ZDM1CEoKzahExUTSZulqc5Rz4htsyRlZt0lJqtxQQ7yK mCrkHjUhkO/R10HRrWZ8LExaBG2AnZ+iXiIhMQTk4NUhnizpkI8TNdQKfSwnlaIMnChm 73W1lr3c40hoQ0tp6F7VJ+2cxe8fxHcJXtfq9sNQmMfVZ/4Z1RP5/IZBiMmEwLhuZg65 oY2mWyLLVAQtq/OzXqkPem3VIbxwsG9s3IzELZSGeTv9dIMKRLisEstfng0/trwONA+r VJOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=WaLHw3zs+WM35AlU6TH2FNE8/HjATL3g2LyVL2XTN7w=; b=ZhpwTNkrnJEwyxxIpiDes5JFur69IjTRppw5UMzz+giBRhTgfhrLUjkez8nBCmsXmn 4fbNv1dU4QMaacfNjUQt6JGJnMHcFbXHxLPzcYFCu6uujUFUAztP0oQXyY4ZngDw34+b YFHUpTx0QU+mdvDbMbeHkEblFosK01469ojlklKevclNUI3e9bGKclwMwmK0v6ksCQnM KDapT/LMOPW97GjSTSI1AJC7BvL07c7R8a83LR5Ropo3/wcXT9k2yEAQxbRN7Oxwf2ZS yIAA7vvfzdzg6eg6iVZnS8GxRNrF9s1Hc4m2i0TIGPAtzsvvNFf8+yM9Vg6WcikYUSiz 6W1Q== X-Gm-Message-State: APzg51C6g7adSGVtrroWUYRSe4L/OTnP5NvDke6BycA2RYT3oX8FygxU 8kPYAg/1pr/6QDlYXw068Td6UwEExCo= X-Google-Smtp-Source: ANB0VdaG9X+yEFwLv8hSV1N39EyVnBbIZnntcMYv8HxsU14w5qMR3xuQOX2vuZWsqFhgyl8BhOH2Tw== X-Received: by 2002:a2e:5c07:: with SMTP id q7-v6mr24044685ljb.119.1536179529132; Wed, 05 Sep 2018 13:32:09 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.86.228]) by smtp.gmail.com with ESMTPSA id i22-v6sm475381lfh.2.2018.09.05.13.32.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 13:32:07 -0700 (PDT) Subject: [PATCH 2/2] clocksource: sh_cmt: add R-Car gen3 support From: Sergei Shtylyov To: Daniel Lezcano , Thomas Gleixner , Rob Herring , devicetree@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org References: <3ce24bfe-1edb-1a92-8847-ff998ac86d16@cogentembedded.com> Organization: Cogent Embedded Message-ID: Date: Wed, 5 Sep 2018 23:32:07 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <3ce24bfe-1edb-1a92-8847-ff998ac86d16@cogentembedded.com> Content-Language: en-MW Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for the R-Car gen3 CMT0 and CMT1 bindings -- they seem to be the same CMT0 and CMT1 as in R-Car gen2 SoCs. Also document R8A779{7|8} bindings as these are the R-Car gen3 SoCs for which the initial support was done. Signed-off-by: Sergei Shtylyov Reviewed-by: Chris Paterson --- Documentation/devicetree/bindings/timer/renesas,cmt.txt | 7 +++++++ drivers/clocksource/sh_cmt.c | 8 ++++++++ 2 files changed, 15 insertions(+) Index: renesas/Documentation/devicetree/bindings/timer/renesas,cmt.txt =================================================================== --- renesas.orig/Documentation/devicetree/bindings/timer/renesas,cmt.txt +++ renesas/Documentation/devicetree/bindings/timer/renesas,cmt.txt @@ -34,6 +34,10 @@ Required Properties: - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793. - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794. - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794. + - "renesas,r8a77970-cmt0" for the 32-bit CMT0 device included in r8a77970. + - "renesas,r8a77970-cmt1" for the 48-bit CMT1 device included in r8a77970. + - "renesas,r8a77980-cmt0" for the 32-bit CMT0 device included in r8a77980. + - "renesas,r8a77980-cmt1" for the 48-bit CMT1 device included in r8a77980. - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2 and RZ/G1. @@ -41,6 +45,9 @@ Required Properties: and RZ/G1. These are fallbacks for r8a73a4, R-Car Gen2 and RZ/G1 entries listed above. + - "renesas,rcar-gen3-cmt0" for 32-bit CMT0 devices included in R-Car Gen3. + - "renesas,rcar-gen3-cmt1" for 48-bit CMT1 devices included in R-Car Gen3. + These are fallbacks for R-Car Gen3 entries listed above. - reg: base address and length of the registers block for the timer module. - interrupts: interrupt-specifier for the timer, one per channel. Index: renesas/drivers/clocksource/sh_cmt.c =================================================================== --- renesas.orig/drivers/clocksource/sh_cmt.c +++ renesas/drivers/clocksource/sh_cmt.c @@ -945,6 +945,14 @@ static const struct of_device_id sh_cmt_ .compatible = "renesas,rcar-gen2-cmt1", .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] }, + { + .compatible = "renesas,rcar-gen3-cmt0", + .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] + }, + { + .compatible = "renesas,rcar-gen3-cmt1", + .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] + }, { } }; MODULE_DEVICE_TABLE(of, sh_cmt_of_table);