diff mbox series

[v2,3/3] dt-bindings: timer: convert rockchip,rk-timer.txt to YAML

Message ID 20210506111136.3941-4-ezequiel@collabora.com
State Accepted
Commit faa186adbd06f3e7113ae1dc6766e2273d5d9231
Headers show
Series Rockchip Timer DT binding YAML conversion | expand

Commit Message

Ezequiel Garcia May 6, 2021, 11:11 a.m. UTC
Convert Rockchip Timer dt-bindings to YAML.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
 .../bindings/timer/rockchip,rk-timer.txt      | 27 --------
 .../bindings/timer/rockchip,rk-timer.yaml     | 64 +++++++++++++++++++
 2 files changed, 64 insertions(+), 27 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt
 create mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml

Comments

Rob Herring May 7, 2021, 9:16 p.m. UTC | #1
On Thu, 06 May 2021 08:11:36 -0300, Ezequiel Garcia wrote:
> Convert Rockchip Timer dt-bindings to YAML.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> ---
>  .../bindings/timer/rockchip,rk-timer.txt      | 27 --------
>  .../bindings/timer/rockchip,rk-timer.yaml     | 64 +++++++++++++++++++
>  2 files changed, 64 insertions(+), 27 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt
>  create mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Heiko Stübner May 28, 2021, 3:56 p.m. UTC | #2
Hi Daniel,

Am Donnerstag, 6. Mai 2021, 13:11:36 CEST schrieb Ezequiel Garcia:
> Convert Rockchip Timer dt-bindings to YAML.

> 

> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>


can you apply this patch to the timer-tree?

Thanks
Heiko

> ---

>  .../bindings/timer/rockchip,rk-timer.txt      | 27 --------

>  .../bindings/timer/rockchip,rk-timer.yaml     | 64 +++++++++++++++++++

>  2 files changed, 64 insertions(+), 27 deletions(-)

>  delete mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt

>  create mode 100644 Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml

> 

> diff --git a/Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt b/Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt

> deleted file mode 100644

> index d65fdce7c7f0..000000000000

> --- a/Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt

> +++ /dev/null

> @@ -1,27 +0,0 @@

> -Rockchip rk timer

> -

> -Required properties:

> -- compatible: should be:

> -  "rockchip,rv1108-timer", "rockchip,rk3288-timer": for Rockchip RV1108

> -  "rockchip,rk3036-timer", "rockchip,rk3288-timer": for Rockchip RK3036

> -  "rockchip,rk3066-timer", "rockchip,rk3288-timer": for Rockchip RK3066

> -  "rockchip,rk3188-timer", "rockchip,rk3288-timer": for Rockchip RK3188

> -  "rockchip,rk3228-timer", "rockchip,rk3288-timer": for Rockchip RK3228

> -  "rockchip,rk3229-timer", "rockchip,rk3288-timer": for Rockchip RK3229

> -  "rockchip,rk3288-timer": for Rockchip RK3288

> -  "rockchip,rk3368-timer", "rockchip,rk3288-timer": for Rockchip RK3368

> -  "rockchip,rk3399-timer": for Rockchip RK3399

> -- reg: base address of the timer register starting with TIMERS CONTROL register

> -- interrupts: should contain the interrupts for Timer0

> -- clocks : must contain an entry for each entry in clock-names

> -- clock-names : must include the following entries:

> -  "timer", "pclk"

> -

> -Example:

> -	timer: timer@ff810000 {

> -		compatible = "rockchip,rk3288-timer";

> -		reg = <0xff810000 0x20>;

> -		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

> -		clocks = <&xin24m>, <&cru PCLK_TIMER>;

> -		clock-names = "timer", "pclk";

> -	};

> diff --git a/Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml b/Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml

> new file mode 100644

> index 000000000000..e26ecb5893ae

> --- /dev/null

> +++ b/Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml

> @@ -0,0 +1,64 @@

> +# SPDX-License-Identifier: GPL-2.0

> +%YAML 1.2

> +---

> +$id: http://devicetree.org/schemas/timer/rockchip,rk-timer.yaml#

> +$schema: http://devicetree.org/meta-schemas/core.yaml#

> +

> +title: Rockchip Timer Device Tree Bindings

> +

> +maintainers:

> +  - Daniel Lezcano <daniel.lezcano@linaro.org>

> +

> +properties:

> +  compatible:

> +    oneOf:

> +      - const: rockchip,rk3288-timer

> +      - const: rockchip,rk3399-timer

> +      - items:

> +          - enum:

> +              - rockchip,rv1108-timer

> +              - rockchip,rk3036-timer

> +              - rockchip,rk3066-timer

> +              - rockchip,rk3188-timer

> +              - rockchip,rk3228-timer

> +              - rockchip,rk3229-timer

> +              - rockchip,rk3288-timer

> +              - rockchip,rk3368-timer

> +              - rockchip,px30-timer

> +          - const: rockchip,rk3288-timer

> +  reg:

> +    maxItems: 1

> +

> +  interrupts:

> +    maxItems: 1

> +

> +  clocks:

> +    minItems: 2

> +    maxItems: 2

> +

> +  clock-names:

> +    items:

> +      - const: pclk

> +      - const: timer

> +

> +required:

> +  - compatible

> +  - reg

> +  - interrupts

> +  - clocks

> +  - clock-names

> +

> +additionalProperties: false

> +

> +examples:

> +  - |

> +    #include <dt-bindings/interrupt-controller/arm-gic.h>

> +    #include <dt-bindings/clock/rk3288-cru.h>

> +

> +    timer: timer@ff810000 {

> +        compatible = "rockchip,rk3288-timer";

> +        reg = <0xff810000 0x20>;

> +        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;

> +        clocks = <&cru PCLK_TIMER>, <&xin24m>;

> +        clock-names = "pclk", "timer";

> +    };

>
Daniel Lezcano May 28, 2021, 3:57 p.m. UTC | #3
On 28/05/2021 17:56, Heiko Stübner wrote:
> Hi Daniel,

> 

> Am Donnerstag, 6. Mai 2021, 13:11:36 CEST schrieb Ezequiel Garcia:

>> Convert Rockchip Timer dt-bindings to YAML.

>>

>> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>

> 

> can you apply this patch to the timer-tree?


Yes


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Ezequiel Garcia June 19, 2021, 2:25 p.m. UTC | #4
Hi Daniel,

On Fri, 2021-05-28 at 17:57 +0200, Daniel Lezcano wrote:
> On 28/05/2021 17:56, Heiko Stübner wrote:

> > Hi Daniel,

> > 

> > Am Donnerstag, 6. Mai 2021, 13:11:36 CEST schrieb Ezequiel Garcia:

> > > Convert Rockchip Timer dt-bindings to YAML.

> > > 

> > > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>

> > 

> > can you apply this patch to the timer-tree?

> 

> Yes

> 

> 


Can't find this one applied in -next, maybe it fell thru somewhere :) ?

Thanks!
Ezequiel
Daniel Lezcano June 21, 2021, 9:39 a.m. UTC | #5
On 19/06/2021 16:25, Ezequiel Garcia wrote:
> Hi Daniel,

> 

> On Fri, 2021-05-28 at 17:57 +0200, Daniel Lezcano wrote:

>> On 28/05/2021 17:56, Heiko Stübner wrote:

>>> Hi Daniel,

>>>

>>> Am Donnerstag, 6. Mai 2021, 13:11:36 CEST schrieb Ezequiel Garcia:

>>>> Convert Rockchip Timer dt-bindings to YAML.

>>>>

>>>> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>

>>>

>>> can you apply this patch to the timer-tree?

>>

>> Yes

>>

>>

> 

> Can't find this one applied in -next, maybe it fell thru somewhere :) ?


Right, I just picked it. Thanks for the heads-up



-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt b/Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt
deleted file mode 100644
index d65fdce7c7f0..000000000000
--- a/Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt
+++ /dev/null
@@ -1,27 +0,0 @@ 
-Rockchip rk timer
-
-Required properties:
-- compatible: should be:
-  "rockchip,rv1108-timer", "rockchip,rk3288-timer": for Rockchip RV1108
-  "rockchip,rk3036-timer", "rockchip,rk3288-timer": for Rockchip RK3036
-  "rockchip,rk3066-timer", "rockchip,rk3288-timer": for Rockchip RK3066
-  "rockchip,rk3188-timer", "rockchip,rk3288-timer": for Rockchip RK3188
-  "rockchip,rk3228-timer", "rockchip,rk3288-timer": for Rockchip RK3228
-  "rockchip,rk3229-timer", "rockchip,rk3288-timer": for Rockchip RK3229
-  "rockchip,rk3288-timer": for Rockchip RK3288
-  "rockchip,rk3368-timer", "rockchip,rk3288-timer": for Rockchip RK3368
-  "rockchip,rk3399-timer": for Rockchip RK3399
-- reg: base address of the timer register starting with TIMERS CONTROL register
-- interrupts: should contain the interrupts for Timer0
-- clocks : must contain an entry for each entry in clock-names
-- clock-names : must include the following entries:
-  "timer", "pclk"
-
-Example:
-	timer: timer@ff810000 {
-		compatible = "rockchip,rk3288-timer";
-		reg = <0xff810000 0x20>;
-		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&xin24m>, <&cru PCLK_TIMER>;
-		clock-names = "timer", "pclk";
-	};
diff --git a/Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml b/Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml
new file mode 100644
index 000000000000..e26ecb5893ae
--- /dev/null
+++ b/Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml
@@ -0,0 +1,64 @@ 
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/timer/rockchip,rk-timer.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Rockchip Timer Device Tree Bindings
+
+maintainers:
+  - Daniel Lezcano <daniel.lezcano@linaro.org>
+
+properties:
+  compatible:
+    oneOf:
+      - const: rockchip,rk3288-timer
+      - const: rockchip,rk3399-timer
+      - items:
+          - enum:
+              - rockchip,rv1108-timer
+              - rockchip,rk3036-timer
+              - rockchip,rk3066-timer
+              - rockchip,rk3188-timer
+              - rockchip,rk3228-timer
+              - rockchip,rk3229-timer
+              - rockchip,rk3288-timer
+              - rockchip,rk3368-timer
+              - rockchip,px30-timer
+          - const: rockchip,rk3288-timer
+  reg:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    minItems: 2
+    maxItems: 2
+
+  clock-names:
+    items:
+      - const: pclk
+      - const: timer
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+  - clock-names
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/clock/rk3288-cru.h>
+
+    timer: timer@ff810000 {
+        compatible = "rockchip,rk3288-timer";
+        reg = <0xff810000 0x20>;
+        interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&cru PCLK_TIMER>, <&xin24m>;
+        clock-names = "pclk", "timer";
+    };