Skip to content

Commit 104553d

Browse files
erwangogalak
authored andcommitted
yaml: fix properties syntax to 'mapping' instead of 'series'
According to yaml syntaxic rules, 'properties' described in dts bindings yaml files could be seen as 'mapping'(key/value couple), instead of 'series' (list of single elements). yaml 'mappings' will then be converted by yaml python library as python 'dict' which will ease treatment (instead of current list as were before this commit). Same treatment is applied to 'inherits'. script extract_dts_inlcude is updated to take change of yaml_list structre into account. This allows some code simplification. Largest impact is yaml_collapse function which works now allow complete overload method on all the attributes of a yaml nodes. Signed-off-by: Erwan Gouriou <[email protected]>
1 parent 26f4395 commit 104553d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+245
-226
lines changed

dts/bindings/arc/arc,dccm.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ description: >
1212
This binding gives a base representation of the ARC DCCM
1313
1414
properties:
15-
- compatible:
15+
compatible:
1616
type: string
1717
category: optional
1818
description: compatible strings
1919
constraint: "arc,dccm"
2020

21-
- reg:
21+
reg:
2222
type: array
2323
description: DCCM memory mapped address space
2424
generation: define

dts/bindings/arc/arc,iccm.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ description: >
1212
This binding gives a base representation of the ARC ICCM
1313
1414
properties:
15-
- compatible:
15+
compatible:
1616
type: string
1717
category: optional
1818
description: compatible strings
1919
constraint: "arc,iccm"
2020

21-
- reg:
21+
reg:
2222
type: array
2323
description: ICCM memory mapped address space
2424
generation: define

dts/bindings/arm/nxp,kinetis-sim.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ description: >
1212
This is a representation of the Kinetis SIM IP node
1313
1414
properties:
15-
- compatible:
15+
compatible:
1616
type: string
1717
category: required
1818
description: compatible strings
1919
constraint: "nxp,kinetis-sim"
2020

21-
- reg:
21+
reg:
2222
type: int
2323
description: mmio register space
2424
generation: define
2525
category: required
2626

27-
- label:
27+
label:
2828
type: string
2929
category: required
3030
description: Human readable string describing the device (used by Zephyr for API name)

dts/bindings/arm/nxp,kw41z-sim.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ description: >
66
This is a representation of the KW41Z SIM IP node
77
88
properties:
9-
- compatible:
9+
compatible:
1010
type: string
1111
category: required
1212
description: compatible strings
1313
constraint: "nxp,kw41z-sim"
1414

15-
- reg:
15+
reg:
1616
type: int
1717
description: mmio register space
1818
generation: define

dts/bindings/arm/ti,cc2650-prcm.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ description: >
88
Power, Reset, and Clock control Module.
99
1010
properties:
11-
- compatible:
11+
compatible:
1212
type: string
1313
category: required
1414
description: compatible strings
1515
constraint: "ti,cc2650-prcm"
1616

17-
- reg:
17+
reg:
1818
type: array
1919
description: mmio register space
2020
generation: define

dts/bindings/clock/nxp,imx-ccm.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ description: >
1212
This is a representation of the i.MX CCM IP node
1313
1414
properties:
15-
- compatible:
15+
compatible:
1616
type: string
1717
category: required
1818
description: compatible strings
1919
constraint: "nxp,imx-ccm"
2020

21-
- reg:
21+
reg:
2222
type: int
2323
description: mmio register space
2424
generation: define
2525
category: required
2626

27-
- label:
27+
label:
2828
type: string
2929
category: required
3030
description: Human readable string describing the device (used by Zephyr for API name)

dts/bindings/clock/st,stm32-rcc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ description: >
77
This binding gives a base representation of the STM32 Clock control
88
99
properties:
10-
- compatible:
10+
compatible:
1111
type: string
1212
category: required
1313
description: compatible strings
1414
constraint: "st,stm32-rcc"
1515

16-
- reg:
16+
reg:
1717
type: array
1818
description: mmio register space
1919
generation: define

dts/bindings/device_node.yaml.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ description: >
1212
properties:
1313

1414
# A typical property entry will look like the following
15-
# - <name of property as it is in device tree>
15+
# <name of property as it is in device tree>
1616
# category: <required | optional>
1717
# type: <string | int | array>
1818
# description: <description of property>
1919
# generation: <define | structure>
2020

2121
# At a minimum, the compatible is required for matching nodes
22-
- compatible: <list of string compatible matches>
22+
compatible: <list of string compatible matches>
2323
category: required
2424
type: string
2525
description: compatible of node
2626

2727
# reg is used to denote mmio registers
28-
- reg:
28+
reg:
2929
type: array
3030
description: mmio register space
3131
generation: define
3232
category: required
3333

3434
# interrupts specifies the interrupts that the driver may utilize
35-
- interrupts:
35+
interrupts:
3636
type: array
3737
category: required
3838
description: required interrupts

dts/bindings/gpio/arm,cmsdk-gpio.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ description: >
77
This binding gives a base representation of the ARM CMSDK GPIO
88
99
properties:
10-
- compatible:
10+
compatible:
1111
type: string
1212
category: required
1313
description: compatible strings
1414
constraint: "arm,cmsdk-gpio"
1515

16-
- reg:
16+
reg:
1717
type: array
1818
description: mmio register space
1919
generation: define
2020
category: required
2121

22-
- interrupts:
22+
interrupts:
2323
type: array
2424
category: required
2525
description: required interrupts

dts/bindings/gpio/nxp,imx-gpio.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ description: >
1111
This is a representation of the i.MX GPIO nodes
1212
1313
properties:
14-
- compatible:
14+
compatible:
1515
type: string
1616
category: required
1717
description: compatible strings
1818
constraint: "nxp,imx-gpio"
1919

20-
- reg:
20+
reg:
2121
type: int
2222
description: mmio register space
2323
generation: define
2424
category: required
2525

26-
- interrupts:
26+
interrupts:
2727
type: compound
2828
category: required
2929
description: required interrupts
3030
generation: define
3131

32-
- label:
32+
label:
3333
type: string
3434
category: required
3535
description: Human readable string describing the device (used by Zephyr for API name)

0 commit comments

Comments
 (0)