diff mbox series

[v3] dt-bindings: arm: Convert Atmel board/soc bindings to json-schema

Message ID 20190517153911.19545-1-robh@kernel.org
State Accepted
Commit 271839b0a819cbb76ef3ce5c7237d6cb624b3eba
Headers show
Series [v3] dt-bindings: arm: Convert Atmel board/soc bindings to json-schema | expand

Commit Message

Rob Herring May 17, 2019, 3:39 p.m. UTC
Convert Atmel SoC bindings to DT schema format using json-schema.

Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Rob Herring <robh@kernel.org>

---
v3:
- correct maintainers

 .../devicetree/bindings/arm/atmel-at91.txt    |  72 ----------
 .../devicetree/bindings/arm/atmel-at91.yaml   | 133 ++++++++++++++++++
 2 files changed, 133 insertions(+), 72 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.txt
 create mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.yaml

-- 
2.20.1

Comments

Alexandre Belloni June 1, 2019, 9:40 p.m. UTC | #1
On 17/05/2019 10:39:11-0500, Rob Herring wrote:
> Convert Atmel SoC bindings to DT schema format using json-schema.

> 

> Cc: Mark Rutland <mark.rutland@arm.com>

> Cc: Nicolas Ferre <nicolas.ferre@microchip.com>

> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>

> Cc: devicetree@vger.kernel.org

> Cc: linux-arm-kernel@lists.infradead.org

> Signed-off-by: Rob Herring <robh@kernel.org>

Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>


> ---

> v3:

> - correct maintainers

> 

>  .../devicetree/bindings/arm/atmel-at91.txt    |  72 ----------

>  .../devicetree/bindings/arm/atmel-at91.yaml   | 133 ++++++++++++++++++

>  2 files changed, 133 insertions(+), 72 deletions(-)

>  delete mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.txt

>  create mode 100644 Documentation/devicetree/bindings/arm/atmel-at91.yaml

> 

> diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt

> deleted file mode 100644

> index 4bf1b4da7659..000000000000

> --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt

> +++ /dev/null

> @@ -1,72 +0,0 @@

> -Atmel AT91 device tree bindings.

> -================================

> -

> -Boards with a SoC of the Atmel AT91 or SMART family shall have the following

> -properties:

> -

> -Required root node properties:

> -compatible: must be one of:

> - * "atmel,at91rm9200"

> -

> - * "atmel,at91sam9" for SoCs using an ARM926EJ-S core, shall be extended with

> -   the specific SoC family or compatible:

> -    o "atmel,at91sam9260"

> -    o "atmel,at91sam9261"

> -    o "atmel,at91sam9263"

> -    o "atmel,at91sam9x5" for the 5 series, shall be extended with the specific

> -      SoC compatible:

> -       - "atmel,at91sam9g15"

> -       - "atmel,at91sam9g25"

> -       - "atmel,at91sam9g35"

> -       - "atmel,at91sam9x25"

> -       - "atmel,at91sam9x35"

> -    o "atmel,at91sam9g20"

> -    o "atmel,at91sam9g45"

> -    o "atmel,at91sam9n12"

> -    o "atmel,at91sam9rl"

> -    o "atmel,at91sam9xe"

> - * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific

> -   SoC family:

> -    o "atmel,sama5d2" shall be extended with the specific SoC compatible:

> -       - "atmel,sama5d27"

> -    o "atmel,sama5d3" shall be extended with the specific SoC compatible:

> -       - "atmel,sama5d31"

> -       - "atmel,sama5d33"

> -       - "atmel,sama5d34"

> -       - "atmel,sama5d35"

> -       - "atmel,sama5d36"

> -    o "atmel,sama5d4" shall be extended with the specific SoC compatible:

> -       - "atmel,sama5d41"

> -       - "atmel,sama5d42"

> -       - "atmel,sama5d43"

> -       - "atmel,sama5d44"

> -

> - * "atmel,samv7" for MCUs using a Cortex-M7, shall be extended with the specific

> -   SoC family:

> -    o "atmel,sams70" shall be extended with the specific MCU compatible:

> -       - "atmel,sams70j19"

> -       - "atmel,sams70j20"

> -       - "atmel,sams70j21"

> -       - "atmel,sams70n19"

> -       - "atmel,sams70n20"

> -       - "atmel,sams70n21"

> -       - "atmel,sams70q19"

> -       - "atmel,sams70q20"

> -       - "atmel,sams70q21"

> -    o "atmel,samv70" shall be extended with the specific MCU compatible:

> -       - "atmel,samv70j19"

> -       - "atmel,samv70j20"

> -       - "atmel,samv70n19"

> -       - "atmel,samv70n20"

> -       - "atmel,samv70q19"

> -       - "atmel,samv70q20"

> -    o "atmel,samv71" shall be extended with the specific MCU compatible:

> -       - "atmel,samv71j19"

> -       - "atmel,samv71j20"

> -       - "atmel,samv71j21"

> -       - "atmel,samv71n19"

> -       - "atmel,samv71n20"

> -       - "atmel,samv71n21"

> -       - "atmel,samv71q19"

> -       - "atmel,samv71q20"

> -       - "atmel,samv71q21"

> diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml

> new file mode 100644

> index 000000000000..7cc1d6c7af55

> --- /dev/null

> +++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml

> @@ -0,0 +1,133 @@

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

> +%YAML 1.2

> +---

> +$id: http://devicetree.org/schemas/arm/atmel-at91.yaml#

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

> +

> +title: Atmel AT91 device tree bindings.

> +

> +maintainers:

> +  - Alexandre Belloni <alexandre.belloni@bootlin.com>

> +  - Ludovic Desroches <ludovic.desroches@microchip.com>

> +

> +description: |

> +  Boards with a SoC of the Atmel AT91 or SMART family shall have the following

> +

> +properties:

> +  $nodename:

> +    const: '/'

> +  compatible:

> +    oneOf:

> +      - items:

> +          - const: atmel,at91rm9200

> +      - items:

> +          - enum:

> +              - olimex,sam9-l9260

> +          - enum:

> +              - atmel,at91sam9260

> +              - atmel,at91sam9261

> +              - atmel,at91sam9263

> +              - atmel,at91sam9g20

> +              - atmel,at91sam9g45

> +              - atmel,at91sam9n12

> +              - atmel,at91sam9rl

> +              - atmel,at91sam9xe

> +          - const: atmel,at91sam9

> +

> +      - items:

> +          - enum:

> +              - atmel,at91sam9g15

> +              - atmel,at91sam9g25

> +              - atmel,at91sam9g35

> +              - atmel,at91sam9x25

> +              - atmel,at91sam9x35

> +          - const: atmel,at91sam9x5

> +          - const: atmel,at91sam9

> +

> +      - items:

> +          - const: atmel,sama5d27

> +          - const: atmel,sama5d2

> +          - const: atmel,sama5

> +

> +      - description: Nattis v2 board with Natte v2 power board

> +        items:

> +          - const: axentia,nattis-2

> +          - const: axentia,natte-2

> +          - const: axentia,linea

> +          - const: atmel,sama5d31

> +          - const: atmel,sama5d3

> +          - const: atmel,sama5

> +

> +      - description: TSE-850 v3 board

> +        items:

> +          - const: axentia,tse850v3

> +          - const: axentia,linea

> +          - const: atmel,sama5d31

> +          - const: atmel,sama5d3

> +          - const: atmel,sama5

> +

> +      - items:

> +          - const: axentia,linea

> +          - const: atmel,sama5d31

> +          - const: atmel,sama5d3

> +          - const: atmel,sama5

> +

> +      - items:

> +          - enum:

> +              - atmel,sama5d31

> +              - atmel,sama5d33

> +              - atmel,sama5d34

> +              - atmel,sama5d35

> +              - atmel,sama5d36

> +          - const: atmel,sama5d3

> +          - const: atmel,sama5

> +

> +      - items:

> +          - enum:

> +              - atmel,sama5d41

> +              - atmel,sama5d42

> +              - atmel,sama5d43

> +              - atmel,sama5d44

> +          - const: atmel,sama5d4

> +          - const: atmel,sama5

> +

> +      - items:

> +          - enum:

> +              - atmel,sams70j19

> +              - atmel,sams70j20

> +              - atmel,sams70j21

> +              - atmel,sams70n19

> +              - atmel,sams70n20

> +              - atmel,sams70n21

> +              - atmel,sams70q19

> +              - atmel,sams70q20

> +              - atmel,sams70q21

> +          - const: atmel,sams70

> +          - const: atmel,samv7

> +

> +      - items:

> +          - enum:

> +              - atmel,samv70j19

> +              - atmel,samv70j20

> +              - atmel,samv70n19

> +              - atmel,samv70n20

> +              - atmel,samv70q19

> +              - atmel,samv70q20

> +          - const: atmel,samv70

> +          - const: atmel,samv7

> +

> +      - items:

> +          - enum:

> +              - atmel,samv71j19

> +              - atmel,samv71j20

> +              - atmel,samv71j21

> +              - atmel,samv71n19

> +              - atmel,samv71n20

> +              - atmel,samv71n21

> +              - atmel,samv71q19

> +              - atmel,samv71q20

> +              - atmel,samv71q21

> +          - const: atmel,samv71

> +          - const: atmel,samv7

> +

> +...

> -- 

> 2.20.1

> 


-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Rob Herring June 13, 2019, 10:46 p.m. UTC | #2
On Sat, Jun 01, 2019 at 11:40:50PM +0200, Alexandre Belloni wrote:
> On 17/05/2019 10:39:11-0500, Rob Herring wrote:

> > Convert Atmel SoC bindings to DT schema format using json-schema.

> > 

> > Cc: Mark Rutland <mark.rutland@arm.com>

> > Cc: Nicolas Ferre <nicolas.ferre@microchip.com>

> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>

> > Cc: devicetree@vger.kernel.org

> > Cc: linux-arm-kernel@lists.infradead.org

> > Signed-off-by: Rob Herring <robh@kernel.org>

> Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>


Is someone going to apply this?

Rob
Alexandre Belloni June 20, 2019, 9:14 a.m. UTC | #3
On 13/06/2019 16:46:52-0600, Rob Herring wrote:
> On Sat, Jun 01, 2019 at 11:40:50PM +0200, Alexandre Belloni wrote:

> > On 17/05/2019 10:39:11-0500, Rob Herring wrote:

> > > Convert Atmel SoC bindings to DT schema format using json-schema.

> > > 

> > > Cc: Mark Rutland <mark.rutland@arm.com>

> > > Cc: Nicolas Ferre <nicolas.ferre@microchip.com>

> > > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>

> > > Cc: devicetree@vger.kernel.org

> > > Cc: linux-arm-kernel@lists.infradead.org

> > > Signed-off-by: Rob Herring <robh@kernel.org>

> > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

> 

> Is someone going to apply this?

> 


I applied it now, I had to fix the missing sam9x60 though.

> Rob


-- 
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt
deleted file mode 100644
index 4bf1b4da7659..000000000000
--- a/Documentation/devicetree/bindings/arm/atmel-at91.txt
+++ /dev/null
@@ -1,72 +0,0 @@ 
-Atmel AT91 device tree bindings.
-================================
-
-Boards with a SoC of the Atmel AT91 or SMART family shall have the following
-properties:
-
-Required root node properties:
-compatible: must be one of:
- * "atmel,at91rm9200"
-
- * "atmel,at91sam9" for SoCs using an ARM926EJ-S core, shall be extended with
-   the specific SoC family or compatible:
-    o "atmel,at91sam9260"
-    o "atmel,at91sam9261"
-    o "atmel,at91sam9263"
-    o "atmel,at91sam9x5" for the 5 series, shall be extended with the specific
-      SoC compatible:
-       - "atmel,at91sam9g15"
-       - "atmel,at91sam9g25"
-       - "atmel,at91sam9g35"
-       - "atmel,at91sam9x25"
-       - "atmel,at91sam9x35"
-    o "atmel,at91sam9g20"
-    o "atmel,at91sam9g45"
-    o "atmel,at91sam9n12"
-    o "atmel,at91sam9rl"
-    o "atmel,at91sam9xe"
- * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific
-   SoC family:
-    o "atmel,sama5d2" shall be extended with the specific SoC compatible:
-       - "atmel,sama5d27"
-    o "atmel,sama5d3" shall be extended with the specific SoC compatible:
-       - "atmel,sama5d31"
-       - "atmel,sama5d33"
-       - "atmel,sama5d34"
-       - "atmel,sama5d35"
-       - "atmel,sama5d36"
-    o "atmel,sama5d4" shall be extended with the specific SoC compatible:
-       - "atmel,sama5d41"
-       - "atmel,sama5d42"
-       - "atmel,sama5d43"
-       - "atmel,sama5d44"
-
- * "atmel,samv7" for MCUs using a Cortex-M7, shall be extended with the specific
-   SoC family:
-    o "atmel,sams70" shall be extended with the specific MCU compatible:
-       - "atmel,sams70j19"
-       - "atmel,sams70j20"
-       - "atmel,sams70j21"
-       - "atmel,sams70n19"
-       - "atmel,sams70n20"
-       - "atmel,sams70n21"
-       - "atmel,sams70q19"
-       - "atmel,sams70q20"
-       - "atmel,sams70q21"
-    o "atmel,samv70" shall be extended with the specific MCU compatible:
-       - "atmel,samv70j19"
-       - "atmel,samv70j20"
-       - "atmel,samv70n19"
-       - "atmel,samv70n20"
-       - "atmel,samv70q19"
-       - "atmel,samv70q20"
-    o "atmel,samv71" shall be extended with the specific MCU compatible:
-       - "atmel,samv71j19"
-       - "atmel,samv71j20"
-       - "atmel,samv71j21"
-       - "atmel,samv71n19"
-       - "atmel,samv71n20"
-       - "atmel,samv71n21"
-       - "atmel,samv71q19"
-       - "atmel,samv71q20"
-       - "atmel,samv71q21"
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.yaml b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
new file mode 100644
index 000000000000..7cc1d6c7af55
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.yaml
@@ -0,0 +1,133 @@ 
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/atmel-at91.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Atmel AT91 device tree bindings.
+
+maintainers:
+  - Alexandre Belloni <alexandre.belloni@bootlin.com>
+  - Ludovic Desroches <ludovic.desroches@microchip.com>
+
+description: |
+  Boards with a SoC of the Atmel AT91 or SMART family shall have the following
+
+properties:
+  $nodename:
+    const: '/'
+  compatible:
+    oneOf:
+      - items:
+          - const: atmel,at91rm9200
+      - items:
+          - enum:
+              - olimex,sam9-l9260
+          - enum:
+              - atmel,at91sam9260
+              - atmel,at91sam9261
+              - atmel,at91sam9263
+              - atmel,at91sam9g20
+              - atmel,at91sam9g45
+              - atmel,at91sam9n12
+              - atmel,at91sam9rl
+              - atmel,at91sam9xe
+          - const: atmel,at91sam9
+
+      - items:
+          - enum:
+              - atmel,at91sam9g15
+              - atmel,at91sam9g25
+              - atmel,at91sam9g35
+              - atmel,at91sam9x25
+              - atmel,at91sam9x35
+          - const: atmel,at91sam9x5
+          - const: atmel,at91sam9
+
+      - items:
+          - const: atmel,sama5d27
+          - const: atmel,sama5d2
+          - const: atmel,sama5
+
+      - description: Nattis v2 board with Natte v2 power board
+        items:
+          - const: axentia,nattis-2
+          - const: axentia,natte-2
+          - const: axentia,linea
+          - const: atmel,sama5d31
+          - const: atmel,sama5d3
+          - const: atmel,sama5
+
+      - description: TSE-850 v3 board
+        items:
+          - const: axentia,tse850v3
+          - const: axentia,linea
+          - const: atmel,sama5d31
+          - const: atmel,sama5d3
+          - const: atmel,sama5
+
+      - items:
+          - const: axentia,linea
+          - const: atmel,sama5d31
+          - const: atmel,sama5d3
+          - const: atmel,sama5
+
+      - items:
+          - enum:
+              - atmel,sama5d31
+              - atmel,sama5d33
+              - atmel,sama5d34
+              - atmel,sama5d35
+              - atmel,sama5d36
+          - const: atmel,sama5d3
+          - const: atmel,sama5
+
+      - items:
+          - enum:
+              - atmel,sama5d41
+              - atmel,sama5d42
+              - atmel,sama5d43
+              - atmel,sama5d44
+          - const: atmel,sama5d4
+          - const: atmel,sama5
+
+      - items:
+          - enum:
+              - atmel,sams70j19
+              - atmel,sams70j20
+              - atmel,sams70j21
+              - atmel,sams70n19
+              - atmel,sams70n20
+              - atmel,sams70n21
+              - atmel,sams70q19
+              - atmel,sams70q20
+              - atmel,sams70q21
+          - const: atmel,sams70
+          - const: atmel,samv7
+
+      - items:
+          - enum:
+              - atmel,samv70j19
+              - atmel,samv70j20
+              - atmel,samv70n19
+              - atmel,samv70n20
+              - atmel,samv70q19
+              - atmel,samv70q20
+          - const: atmel,samv70
+          - const: atmel,samv7
+
+      - items:
+          - enum:
+              - atmel,samv71j19
+              - atmel,samv71j20
+              - atmel,samv71j21
+              - atmel,samv71n19
+              - atmel,samv71n20
+              - atmel,samv71n21
+              - atmel,samv71q19
+              - atmel,samv71q20
+              - atmel,samv71q21
+          - const: atmel,samv71
+          - const: atmel,samv7
+
+...