diff mbox series

[v4,2/5] dt-bindings: arm: ti: Convert K3 board/soc bindings to DT schema

Message ID 20200914162231.2535-3-lokeshvutla@ti.com (mailing list archive)
State New, archived
Headers show
Series arm64: Initial support for Texas Instrument's J7200 Platform | expand

Commit Message

Lokesh Vutla Sept. 14, 2020, 4:22 p.m. UTC 
Convert TI K3 Board/SoC bindings to DT schema format.

Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 .../devicetree/bindings/arm/ti/k3.txt         | 26 ----------------
 .../devicetree/bindings/arm/ti/k3.yaml        | 31 +++++++++++++++++++
 MAINTAINERS                                   |  2 +-
 3 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/ti/k3.txt
 create mode 100644 Documentation/devicetree/bindings/arm/ti/k3.yaml

Comments

Suman Anna Sept. 15, 2020, 3:31 p.m. UTC | #1 
On 9/14/20 11:22 AM, Lokesh Vutla wrote:
> Convert TI K3 Board/SoC bindings to DT schema format.
> 
> Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
>  .../devicetree/bindings/arm/ti/k3.txt         | 26 ----------------
>  .../devicetree/bindings/arm/ti/k3.yaml        | 31 +++++++++++++++++++
>  MAINTAINERS                                   |  2 +-
>  3 files changed, 32 insertions(+), 27 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/arm/ti/k3.txt
>  create mode 100644 Documentation/devicetree/bindings/arm/ti/k3.yaml
> 
> diff --git a/Documentation/devicetree/bindings/arm/ti/k3.txt b/Documentation/devicetree/bindings/arm/ti/k3.txt
> deleted file mode 100644
> index 333e7256126a..000000000000
> --- a/Documentation/devicetree/bindings/arm/ti/k3.txt
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Texas Instruments K3 Multicore SoC architecture device tree bindings
> ---------------------------------------------------------------------
> -
> -Platforms based on Texas Instruments K3 Multicore SoC architecture
> -shall follow the following scheme:
> -
> -SoCs
> -----
> -
> -Each device tree root node must specify which exact SoC in K3 Multicore SoC
> -architecture it uses, using one of the following compatible values:
> -
> -- AM654
> -  compatible = "ti,am654";
> -
> -- J721E
> -  compatible = "ti,j721e";
> -
> -Boards
> -------
> -
> -In addition, each device tree root node must specify which one or more
> -of the following board-specific compatible values:
> -
> -- AM654 EVM
> -  compatible = "ti,am654-evm", "ti,am654";
> diff --git a/Documentation/devicetree/bindings/arm/ti/k3.yaml b/Documentation/devicetree/bindings/arm/ti/k3.yaml
> new file mode 100644
> index 000000000000..c5e3e4aeda8e
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/ti/k3.yaml
> @@ -0,0 +1,31 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/arm/ti/k3.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Texas Instruments K3 Multicore SoC architecture device tree bindings
> +
> +maintainers:
> +  - Nishanth Menon <nm@ti.com>
> +
> +description: |
> +  Platforms based on Texas Instruments K3 Multicore SoC architecture
> +  shall have the following properties.
> +
> +properties:
> +  $nodename:
> +    const: '/'
> +  compatible:
> +    oneOf:
> +
> +      - description: K3 AM654 SoC
> +        items:
> +          - enum:
> +              - ti,am654-evm

I am guessing the enum is for adding other vendors compatibles when they get
added in the future. Otherwise, const would have sufficed. So, looks ok.

Reviewed-by: Suman Anna <s-anna@ti.com>

regards
Suman

> +          - const: ti,am654
> +
> +      - description: K3 J721E SoC
> +        items:
> +          - const: ti,j721e
> +...
> diff --git a/MAINTAINERS b/MAINTAINERS
> index e4647c84c987..076fae9aa75b 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2636,7 +2636,7 @@ M:	Tero Kristo <t-kristo@ti.com>
>  M:	Nishanth Menon <nm@ti.com>
>  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
>  S:	Supported
> -F:	Documentation/devicetree/bindings/arm/ti/k3.txt
> +F:	Documentation/devicetree/bindings/arm/ti/k3.yaml
>  F:	arch/arm64/boot/dts/ti/Makefile
>  F:	arch/arm64/boot/dts/ti/k3-*
>  F:	include/dt-bindings/pinctrl/k3.h
>
Rob Herring (Arm) Sept. 22, 2020, 11:41 p.m. UTC | #2 
On Mon, 14 Sep 2020 21:52:28 +0530, Lokesh Vutla wrote:
> Convert TI K3 Board/SoC bindings to DT schema format.
> 
> Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
>  .../devicetree/bindings/arm/ti/k3.txt         | 26 ----------------
>  .../devicetree/bindings/arm/ti/k3.yaml        | 31 +++++++++++++++++++
>  MAINTAINERS                                   |  2 +-
>  3 files changed, 32 insertions(+), 27 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/arm/ti/k3.txt
>  create mode 100644 Documentation/devicetree/bindings/arm/ti/k3.yaml
> 

Reviewed-by: Rob Herring <robh@kernel.org>
Rob Herring Sept. 28, 2020, 4:51 p.m. UTC | #3 
On Mon, Sep 14, 2020 at 11:22 AM Lokesh Vutla <lokeshvutla@ti.com> wrote:
>
> Convert TI K3 Board/SoC bindings to DT schema format.
>
> Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
>  .../devicetree/bindings/arm/ti/k3.txt         | 26 ----------------
>  .../devicetree/bindings/arm/ti/k3.yaml        | 31 +++++++++++++++++++
>  MAINTAINERS                                   |  2 +-
>  3 files changed, 32 insertions(+), 27 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/arm/ti/k3.txt
>  create mode 100644 Documentation/devicetree/bindings/arm/ti/k3.yaml

This causes warnings in ti,omap-hwspinlock.yaml which also landed for 5.10:

/builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
/: compatible: ['ti,am654'] is not valid under any of the given
schemas (Possible causes of the failure):
/builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
/: compatible: ['ti,am654'] is too short
/builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
/: compatible:0: 'ti,am654' is not one of ['ti,am654-evm']
/builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
/: compatible:0: 'ti,j721e' was expected
/builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
/: compatible:0: 'ti,j7200' was expected

From schema: /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/arm/ti/k3.yaml

Please fix. I'd suggest just removing part of the example. It's not relevant.

Rob
Nishanth Menon Sept. 30, 2020, 12:15 p.m. UTC | #4 
On 11:51-20200928, Rob Herring wrote:
> On Mon, Sep 14, 2020 at 11:22 AM Lokesh Vutla <lokeshvutla@ti.com> wrote:
> >
> > Convert TI K3 Board/SoC bindings to DT schema format.
> >
> > Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> > ---
> >  .../devicetree/bindings/arm/ti/k3.txt         | 26 ----------------
> >  .../devicetree/bindings/arm/ti/k3.yaml        | 31 +++++++++++++++++++
> >  MAINTAINERS                                   |  2 +-
> >  3 files changed, 32 insertions(+), 27 deletions(-)
> >  delete mode 100644 Documentation/devicetree/bindings/arm/ti/k3.txt
> >  create mode 100644 Documentation/devicetree/bindings/arm/ti/k3.yaml
> 
> This causes warnings in ti,omap-hwspinlock.yaml which also landed for 5.10:
> 
> /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
> /: compatible: ['ti,am654'] is not valid under any of the given
> schemas (Possible causes of the failure):
> /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
> /: compatible: ['ti,am654'] is too short
> /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
> /: compatible:0: 'ti,am654' is not one of ['ti,am654-evm']
> /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
> /: compatible:0: 'ti,j721e' was expected
> /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/hwlock/ti,omap-hwspinlock.example.dt.yaml:
> /: compatible:0: 'ti,j7200' was expected
> 
> From schema: /builds/robherring/linux-dt-bindings/Documentation/devicetree/bindings/arm/ti/k3.yaml
> 
> Please fix. I'd suggest just removing part of the example. It's not relevant.


	I think this is addressed by [1]

[1] https://lore.kernel.org/linux-arm-kernel/20200928225155.12432-1-s-anna@ti.com/
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/arm/ti/k3.txt b/Documentation/devicetree/bindings/arm/ti/k3.txt
deleted file mode 100644
index 333e7256126a..000000000000
--- a/Documentation/devicetree/bindings/arm/ti/k3.txt
+++ /dev/null
@@ -1,26 +0,0 @@ 
-Texas Instruments K3 Multicore SoC architecture device tree bindings
---------------------------------------------------------------------
-
-Platforms based on Texas Instruments K3 Multicore SoC architecture
-shall follow the following scheme:
-
-SoCs
-----
-
-Each device tree root node must specify which exact SoC in K3 Multicore SoC
-architecture it uses, using one of the following compatible values:
-
-- AM654
-  compatible = "ti,am654";
-
-- J721E
-  compatible = "ti,j721e";
-
-Boards
-------
-
-In addition, each device tree root node must specify which one or more
-of the following board-specific compatible values:
-
-- AM654 EVM
-  compatible = "ti,am654-evm", "ti,am654";
diff --git a/Documentation/devicetree/bindings/arm/ti/k3.yaml b/Documentation/devicetree/bindings/arm/ti/k3.yaml
new file mode 100644
index 000000000000..c5e3e4aeda8e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/ti/k3.yaml
@@ -0,0 +1,31 @@ 
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/ti/k3.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments K3 Multicore SoC architecture device tree bindings
+
+maintainers:
+  - Nishanth Menon <nm@ti.com>
+
+description: |
+  Platforms based on Texas Instruments K3 Multicore SoC architecture
+  shall have the following properties.
+
+properties:
+  $nodename:
+    const: '/'
+  compatible:
+    oneOf:
+
+      - description: K3 AM654 SoC
+        items:
+          - enum:
+              - ti,am654-evm
+          - const: ti,am654
+
+      - description: K3 J721E SoC
+        items:
+          - const: ti,j721e
+...
diff --git a/MAINTAINERS b/MAINTAINERS
index e4647c84c987..076fae9aa75b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2636,7 +2636,7 @@  M:	Tero Kristo <t-kristo@ti.com>
 M:	Nishanth Menon <nm@ti.com>
 L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:	Supported
-F:	Documentation/devicetree/bindings/arm/ti/k3.txt
+F:	Documentation/devicetree/bindings/arm/ti/k3.yaml
 F:	arch/arm64/boot/dts/ti/Makefile
 F:	arch/arm64/boot/dts/ti/k3-*
 F:	include/dt-bindings/pinctrl/k3.h