From patchwork Mon Mar 14 14:24:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 8579491 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A98EA9F758 for ; Mon, 14 Mar 2016 14:21:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B10020260 for ; Mon, 14 Mar 2016 14:21:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50C37203ED for ; Mon, 14 Mar 2016 14:21:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965283AbcCNOVI (ORCPT ); Mon, 14 Mar 2016 10:21:08 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34224 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965228AbcCNOVG (ORCPT ); Mon, 14 Mar 2016 10:21:06 -0400 Received: by mail-pf0-f182.google.com with SMTP id x3so43323897pfb.1; Mon, 14 Mar 2016 07:21:06 -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=33TwadtZP0SkVjv+YN94/LUr4aGR8Px2xv5xdSpyMdk=; b=ugV1Ayj6P0Jf31F6rkHmtpC2ttulc1d67jltnvqgDpvz+53itDM8ksjhOAx68rs3bE axNQnrMRiaAY3Pt3YgWk72rzWawhIFtOhRt/r4CDDFodU2HEY8UtfkQ7v8SMFpPF0HZn XYNVJonkF9Au5dfY1HZsRhPhQ+WhTL2ylz01GdQ2MQacWBa4GTUIheVAPzNsNNL51RH2 CKOrAE4sHxlSxh3m7qNFldNJK0MhFAaVQ767MDh6z0DM4i+b99YrIOS9jSM/rGeTJ2yC g2v6MmjqD5KW4Brf3y2Mjr7Deeop3QRcR8ztQYb4EEGYDxzwFtp+4Y6M2AYqeQWQa4sD phSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=33TwadtZP0SkVjv+YN94/LUr4aGR8Px2xv5xdSpyMdk=; b=YkIkwMw8a1pXRL185CS2Z8a6SnT5EdOICMmzxGixsUisN0JGAtj1SfRDwSiPq1FtSX w6NlmAbr0XfhbUqrmm+kuy1HKF4EDkJWnMufi5VZUiOs+b0b4p/W6N7zTqP+6eTbNd1P r+9xwXHd5azam0SrrnpROLKWJh5Mr4zVvZVRULDuxp2SDQiHhHDJkd6lEoMNScIJBGs8 dSltxEKhrSJAFtDPbn5gFYdj5nwic/ZvDfl341W+O9RNsvXN7ZUaugj0TAAKy0N4HIlq nJl1ZpXxXbITlIkekKltQfW2E/IJkNh5f4nuIYPZ8zupCCzxknc1RxhlH06SuniV/pnH sd/w== X-Gm-Message-State: AD7BkJJFF/rbUXoa6+c7kOk1yEA8kUclaQcucFwI549rNYQbQWffZjAHd+uGCrrRDRKcMA== X-Received: by 10.98.32.23 with SMTP id g23mr30416156pfg.74.1457965265594; Mon, 14 Mar 2016 07:21:05 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id g23sm32695168pfg.35.2016.03.14.07.21.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Mar 2016 07:21:03 -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, robh@kernel.org, daniel.lezcano@linaro.org, linux-renesas-soc@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm , tglx@linutronix.de Date: Mon, 14 Mar 2016 23:24:24 +0900 Message-Id: <20160314142424.17180.47541.sendpatchset@little-apple> In-Reply-To: <20160314142342.17180.21352.sendpatchset@little-apple> References: <20160314142342.17180.21352.sendpatchset@little-apple> Subject: [PATCH v4 04/06] devicetree: bindings: Deprecate property, update example Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 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 Deprecate "renesas,channels-mask" and update the r8a7790 CMT example. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Acked-by: Laurent Pinchart Acked-by: Rob Herring --- Changes since V3: - Update example to use new compat string format for fallback entries Now "renesas,rcar-gen2-cmt0" is used instead of "renesas,cmt0-rcar-gen2" Changes since V2: - Added Acked-by from Rob - Removed Tested-by tag from DT binding patch - duh! Changes since V1: - Added Acked-by and Tested-by from Geert - Added Acked-by from Laurent Documentation/devicetree/bindings/timer/renesas,cmt.txt | 24 ++++++++++----- 1 file changed, 17 insertions(+), 7 deletions(-) --- 0006/Documentation/devicetree/bindings/timer/renesas,cmt.txt +++ work/Documentation/devicetree/bindings/timer/renesas,cmt.txt 2016-03-14 22:40:35.550513000 +0900 @@ -60,21 +60,31 @@ Required Properties: in clock-names. - clock-names: must contain "fck" for the functional clock. - - renesas,channels-mask: bitmask of the available channels. + - renesas,channels-mask: , information kept in device driver. -Example: R8A7790 (R-Car H2) CMT0 node - - CMT0 on R8A7790 implements hardware channels 5 and 6 only and names - them channels 0 and 1 in the documentation. +Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes cmt0: timer@ffca0000 { - compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2"; + compatible = "renesas,cmt0-r8a7790", "renesas,rcar-gen2-cmt0"; reg = <0 0xffca0000 0 0x1004>; interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>, <0 142 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp1_clks R8A7790_CLK_CMT0>; clock-names = "fck"; + }; - renesas,channels-mask = <0x60>; + cmt1: timer@e6130000 { + compatible = "renesas,cmt1-r8a7790", "renesas,rcar-gen2-cmt1"; + reg = <0 0xe6130000 0 0x1004>; + interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, + <0 121 IRQ_TYPE_LEVEL_HIGH>, + <0 122 IRQ_TYPE_LEVEL_HIGH>, + <0 123 IRQ_TYPE_LEVEL_HIGH>, + <0 124 IRQ_TYPE_LEVEL_HIGH>, + <0 125 IRQ_TYPE_LEVEL_HIGH>, + <0 126 IRQ_TYPE_LEVEL_HIGH>, + <0 127 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&mstp3_clks R8A7790_CLK_CMT1>; + clock-names = "fck"; };