From patchwork Thu Sep 17 09:54:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 518782 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 63EC01401AF for ; Thu, 17 Sep 2015 20:03:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Gmm4V3ir; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753427AbbIQJyh (ORCPT ); Thu, 17 Sep 2015 05:54:37 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:33235 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751026AbbIQJye (ORCPT ); Thu, 17 Sep 2015 05:54:34 -0400 Received: by pacex6 with SMTP id ex6so16432405pac.0; Thu, 17 Sep 2015 02:54:34 -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=BZskdVktFljbR6tpue9Td5UZ1ArtxPWrhJ0DT6eZLmc=; b=Gmm4V3ire0lvMSZIn8nWxSP8gjr3thuzNDpla6DeFdbaYh63zpbQIsLgrGtmFAgX4N Qs2LAZQu9n+tISWMBykD/HzCEcYtPUXYceUoK1g7kOdV+AkVqnJNJnOVUb+8CyPJGheE v/Sq7I/qdfhQa9wtamPFxBeBxIXhIg2ip6qbPbTDQV1x9wo3ymhwrNiVpk+hjh2tPamM YfKOWvCm+JFnPo+CEnU22Hw1kxXBdsJ6Qk/G9chGQ5IomY3DHJVbHZdYKjsJWwTdJSy7 ZyM+e+TtDRX23m3lcn5SBRDqeS5mLho1QY0/Pbk8QAUc6p+2dDz1o8RwmXyYHt5rev1c ej3w== X-Received: by 10.66.233.97 with SMTP id tv1mr69984183pac.110.1442483674184; Thu, 17 Sep 2015 02:54:34 -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 rb8sm2645461pbb.63.2015.09.17.02.54.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2015 02:54:33 -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: Thu, 17 Sep 2015 18:54:33 +0900 Message-Id: <20150917095433.5369.61472.sendpatchset@little-apple> In-Reply-To: <20150917095325.5369.73893.sendpatchset@little-apple> References: <20150917095325.5369.73893.sendpatchset@little-apple> Subject: [PATCH v2 07/11] devicetree: bindings: Deprecate property, update example Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Magnus Damm Deprecate "renesas,channels-mask" and update the r8a7790 CMT example. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Tested-by: Geert Uytterhoeven Acked-by: Laurent Pinchart --- 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(-) -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0009/Documentation/devicetree/bindings/timer/renesas,cmt.txt +++ work/Documentation/devicetree/bindings/timer/renesas,cmt.txt 2015-09-17 17:39:47.080513000 +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,cmt0-rcar-gen2"; 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,cmt1-rcar-gen2"; + 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"; };