Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1722283

[PATCH 6/9] devicetree: bindings: Deprecate property, update example

From Daniel Lezcano <daniel.lezcano@linaro.org>
Newsgroups linux.kernel
Subject [PATCH 6/9] devicetree: bindings: Deprecate property, update example
Date 2017-08-29 11:40 +0200
Message-ID <ujLa3-T4-49@gated-at.bofh.it> (permalink)
References <ujLa1-T4-7@gated-at.bofh.it> <ujLa1-T4-9@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Magnus Damm <damm+renesas@opensource.se>

Deprecate "renesas,channels-mask" and update the r8a7790 CMT example.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 .../devicetree/bindings/timer/renesas,cmt.txt      | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.txt b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
index e81e0d2..8fb7c93 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
@@ -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: <deprecated>, 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";
 	};
-- 
2.7.4

Back to linux.kernel | Previous | NextPrevious in thread | Find similar | Unroll thread


Thread

[PATCH 1/9] dt-bindings: timer: Add nxp tpm timer binding doc Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 11:40 +0200
  [PATCH 3/9] devicetree: bindings: Remove sh7372 CMT binding Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 11:40 +0200
  [PATCH 9/9] clocksource/drivers/bcm2835: Remove message on memory allocation failure Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 11:40 +0200
    Re: [PATCH 9/9] clocksource/drivers/bcm2835: Remove message on memory  allocation failure SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-29 13:30 +0200
      Re: [PATCH 9/9] clocksource/drivers/bcm2835: Remove message on memory  allocation failure Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 13:50 +0200
        Re: [PATCH 9/9] clocksource/drivers/bcm2835: Remove message on memory  allocation failure Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 15:20 +0200
          Re: clocksource/drivers/bcm2835: Remove message on memory allocation  failure SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-29 15:30 +0200
            Re: clocksource/drivers/bcm2835: Remove message on memory allocation  failure Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 15:30 +0200
        Re: [PATCH 9/9] clocksource/drivers/bcm2835: Remove message on memory  allocation failure SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-29 15:20 +0200
  [PATCH 2/9] clocksource/drivers/imx-tpm: Add imx tpm timer support Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 11:40 +0200
  [PATCH 6/9] devicetree: bindings: Deprecate property, update example Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-08-29 11:40 +0200

csiph-web