From patchwork Sun Jun 21 08:10:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 6652091 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 48C90C05AD for ; Sun, 21 Jun 2015 08:07:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84DF32068A for ; Sun, 21 Jun 2015 08:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EC162069D for ; Sun, 21 Jun 2015 08:07:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932714AbbFUIHf (ORCPT ); Sun, 21 Jun 2015 04:07:35 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:36493 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932645AbbFUIHZ (ORCPT ); Sun, 21 Jun 2015 04:07:25 -0400 Received: by pdjm12 with SMTP id m12so118185661pdj.3; Sun, 21 Jun 2015 01:07:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=ro7LWos0qhERCF4zOYGMPDrXyqnZuVzR06AFmluh9/A=; b=N/Pw7fCXYjxqn5fpOSUv095Kda66Ywq80kbZ2skUHjN1ZYgA2kr9luLmJIaxALjoT1 N/XeRJi5ch6GPDcXf0AdYPKl2CRnz4RKeTHzNZ0EuO5c5BuyoweNO8OoRovk0zfP+qBM oRE6JyPtwkuNUyvYLq7yQ0A1RyTDLM/WPhUhpoIjIr/7aWMi/Hv0z3JOEBXHaAwLHRPA 1AVquoeVPAJ8ATmetr6jbxpSCz4LyE1LMQzdlKK7a559IGNe/jEKbt7itJLxIEfo17r9 5x3klRwf/sAbncp6SRHD23S3doEtjILfNuDxsNvWZnbCj4xDvN/xupRgZJoUoVk/DDly dE6g== X-Received: by 10.70.32.164 with SMTP id k4mr48445607pdi.138.1434874044463; Sun, 21 Jun 2015 01:07:24 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id ml10sm16276694pab.47.2015.06.21.01.07.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Jun 2015 01:07:23 -0700 (PDT) From: Magnus Damm To: linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linux-sh@vger.kernel.org, daniel.lezcano@linaro.org, horms+renesas@verge.net.au, Magnus Damm , tglx@linutronix.de Date: Sun, 21 Jun 2015 17:10:11 +0900 Message-Id: <20150621081011.10187.94046.sendpatchset@little-apple> In-Reply-To: <20150621080903.10187.20998.sendpatchset@little-apple> References: <20150621080903.10187.20998.sendpatchset@little-apple> Subject: [PATCH 06/08] ARM: shmobile: Update CMT compat string users in DTS Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Use recently updated r8a73a4 and R-Car Gen2 CMT0 and CMT1 compat strings. With this change in place we can keep device-specific configuration in the driver and the driver can be able to support CMT1 specific features. Signed-off-by: Magnus Damm --- arch/arm/boot/dts/r8a73a4.dtsi | 2 +- arch/arm/boot/dts/r8a7790.dtsi | 4 ++-- arch/arm/boot/dts/r8a7791.dtsi | 4 ++-- arch/arm/boot/dts/r8a7793.dtsi | 4 ++-- arch/arm/boot/dts/r8a7794.dtsi | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in --- 0001/arch/arm/boot/dts/r8a73a4.dtsi +++ work/arch/arm/boot/dts/r8a73a4.dtsi 2015-06-20 14:46:07.442366518 +0900 @@ -114,7 +114,7 @@ }; cmt1: timer@e6130000 { - compatible = "renesas,cmt-48-r8a73a4", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt1-r8a73a4", "renesas,cmt1-rcar-gen2"; reg = <0 0xe6130000 0 0x1004>; interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A73A4_CLK_CMT1>; --- 0001/arch/arm/boot/dts/r8a7790.dtsi +++ work/arch/arm/boot/dts/r8a7790.dtsi 2015-06-20 14:47:48.652366518 +0900 @@ -212,7 +212,7 @@ }; cmt0: timer@ffca0000 { - compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt0-r8a7790", "renesas,cmt0-rcar-gen2"; reg = <0 0xffca0000 0 0x1004>; interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>, <0 143 IRQ_TYPE_LEVEL_HIGH>; @@ -225,7 +225,7 @@ }; cmt1: timer@e6130000 { - compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt1-r8a7790", "renesas,cmt1-rcar-gen2"; reg = <0 0xe6130000 0 0x1004>; interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, <0 121 IRQ_TYPE_LEVEL_HIGH>, --- 0001/arch/arm/boot/dts/r8a7791.dtsi +++ work/arch/arm/boot/dts/r8a7791.dtsi 2015-06-20 14:47:28.652366518 +0900 @@ -193,7 +193,7 @@ }; cmt0: timer@ffca0000 { - compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt0-r8a7791", "renesas,cmt0-rcar-gen2"; reg = <0 0xffca0000 0 0x1004>; interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>, <0 143 IRQ_TYPE_LEVEL_HIGH>; @@ -206,7 +206,7 @@ }; cmt1: timer@e6130000 { - compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt1-r8a7791", "renesas,cmt1-rcar-gen2"; reg = <0 0xe6130000 0 0x1004>; interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, <0 121 IRQ_TYPE_LEVEL_HIGH>, --- 0001/arch/arm/boot/dts/r8a7793.dtsi +++ work/arch/arm/boot/dts/r8a7793.dtsi 2015-06-20 14:46:58.642366518 +0900 @@ -62,7 +62,7 @@ }; cmt0: timer@ffca0000 { - compatible = "renesas,cmt-48-r8a7793", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt0-r8a7793", "renesas,cmt0-rcar-gen2"; reg = <0 0xffca0000 0 0x1004>; interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>, <0 143 IRQ_TYPE_LEVEL_HIGH>; @@ -75,7 +75,7 @@ }; cmt1: timer@e6130000 { - compatible = "renesas,cmt-48-r8a7793", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt1-r8a7793", "renesas,cmt1-rcar-gen2"; reg = <0 0xe6130000 0 0x1004>; interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, <0 121 IRQ_TYPE_LEVEL_HIGH>, --- 0001/arch/arm/boot/dts/r8a7794.dtsi +++ work/arch/arm/boot/dts/r8a7794.dtsi 2015-06-20 14:47:17.122366518 +0900 @@ -51,7 +51,7 @@ }; cmt0: timer@ffca0000 { - compatible = "renesas,cmt-48-gen2"; + compatible = "renesas,cmt0-r8a7794", "renesas,cmt0-rcar-gen2"; reg = <0 0xffca0000 0 0x1004>; interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>, <0 143 IRQ_TYPE_LEVEL_HIGH>; @@ -64,7 +64,7 @@ }; cmt1: timer@e6130000 { - compatible = "renesas,cmt-48-gen2"; + compatible = "renesas,cmt1-r8a7794", "renesas,cmt1-rcar-gen2"; reg = <0 0xe6130000 0 0x1004>; interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, <0 121 IRQ_TYPE_LEVEL_HIGH>,