Skip to content

[TOPIC: DTS] dts: bindings: Have 'required: true/false' instead of 'category: ...' (take two, edtlib version) #18723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions dts/binding-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ description: >
#
# If a field appears both in the binding and in a file it inherits, then the
# value in the binding takes precedence. This can be used e.g. to change a
# 'category: optional' from an inherited file to a 'category: required' (see
# the 'properties' description below).
# 'required: false' from an inherited file to a 'required: true' (see the
# 'properties' description below).
inherits:
!include other.yaml # or [other1.yaml, other2.yaml]

Expand Down Expand Up @@ -39,7 +39,7 @@ sub-node:
properties:
pwms:
type: compound
category: required
required: true

# 'properties' describes properties on the node, e.g.
#
Expand All @@ -55,7 +55,7 @@ sub-node:
# A typical property entry looks like this:
#
# <property name>:
# category: <required | optional>
# required: <true | false>
# type: <string | int | boolean | array | uint8-array | string-array |
# phandle | phandles | phandle-array | compound>
# description: <description of the property>
Expand Down Expand Up @@ -106,23 +106,23 @@ properties:
constraint: "foo-company,bar-device"

# Describes a property like 'current-speed = <115200>;'. We pretend that
# it's obligatory for the example node and set 'category: required'.
# it's obligatory for the example node and set 'required: true'.
current-speed:
type: int
category: required
required: true
description: Initial baud rate for bar-device

# Describes an optional property like 'keys = "foo", "bar";'
keys:
type: string-array
category: optional
required: false
description: Keys for bar-device

# Describes an optional property like 'maximum-speed = "full-speed";
# the enum specifies known values that the string property may take
maximum-speed:
type: string
category: optional
required: false
description: Configures USB controllers to work up to a specific speed.
enum:
- "low-speed"
Expand All @@ -134,7 +134,7 @@ properties:
# specifies that the value for the property is expected to be the value 1
"#address-cells":
type: int
category: required
required: true
const: 1

# If the binding describes an interrupt controller, GPIO controller, pinmux
Expand Down
2 changes: 1 addition & 1 deletion dts/bindings/arc/arc,dccm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ properties:
constraint: "arc,dccm"

reg:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arc/arc,iccm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ properties:
constraint: "arc,iccm"

reg:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arm/arm,dtcm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ properties:
constraint: "arm,dtcm"

reg:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arm/arm,scc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ properties:
constraint: "arm,scc"

reg:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arm/atmel,sam0-device_id.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ properties:
constraint: "atmel,sam0-id"

reg:
category: required
required: true
4 changes: 2 additions & 2 deletions dts/bindings/arm/atmel,sam0-dmac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ properties:
constraint: "atmel,sam0-dmac"

reg:
category: required
required: true

interrupts:
category: required
required: true
4 changes: 2 additions & 2 deletions dts/bindings/arm/atmel,sam0-sercom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ properties:
constraint: "atmel,sam0-sercom"

reg:
category: required
required: true

interrupts:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arm/nordic,nrf-dppic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ properties:
constraint: "nordic,nrf-dppic"

reg:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arm/nordic,nrf-ficr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ properties:
constraint: "nordic,nrf-ficr"

reg:
category: required
required: true
4 changes: 2 additions & 2 deletions dts/bindings/arm/nordic,nrf-spu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ properties:
constraint: "nordic,nrf-spu"

reg:
category: required
required: true

interrupts:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arm/nordic,nrf-uicr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ properties:
constraint: "nordic,nrf-uicr"

reg:
category: required
required: true
2 changes: 1 addition & 1 deletion dts/bindings/arm/nxp,imx-dtcm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ properties:
constraint: "nxp,imx-dtcm"

reg:
category: required
required: true
10 changes: 5 additions & 5 deletions dts/bindings/arm/nxp,imx-epit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ properties:
constraint: "nxp,imx-epit"

reg:
category: required
required: true

interrupts:
category: required
required: true

label:
category: required
required: true

prescaler:
type: int
category: required
required: true
description: Set the EPIT prescaler between 0 and 4095

rdc:
type: int
category: required
required: true
description: Set the RDC permission for this peripheral
2 changes: 1 addition & 1 deletion dts/bindings/arm/nxp,imx-itcm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ properties:
constraint: "nxp,imx-itcm"

reg:
category: required
required: true
8 changes: 4 additions & 4 deletions dts/bindings/arm/nxp,imx-mu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ properties:
constraint: "nxp,imx-mu"

reg:
category: required
required: true

interrupts:
category: required
required: true

label:
category: required
required: true

rdc:
type: int
category: required
required: true
description: Set the RDC permission for this peripheral
4 changes: 2 additions & 2 deletions dts/bindings/arm/nxp,kinetis-mcg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ properties:
constraint: "nxp,kinetis-mcg"

reg:
category: required
required: true

label:
category: required
required: true

"#clock-cells":
const: 1
Expand Down
4 changes: 2 additions & 2 deletions dts/bindings/arm/nxp,kinetis-pcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ properties:
constraint: "nxp,kinetis-pcc"

reg:
category: required
required: true

label:
category: required
required: true

"#clock-cells":
const: 1
Expand Down
44 changes: 22 additions & 22 deletions dts/bindings/arm/nxp,kinetis-scg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,110 +17,110 @@ properties:
constraint: "nxp,kinetis-scg"

reg:
category: required
required: true

label:
category: required
required: true

clk-divider-slow:
type: int
description: system clock to slow clock divider
category: required
required: true

clk-divider-bus:
type: int
description: system clock to bus clock divider
category: required
required: true

clk-divider-core:
type: int
description: system clock to core clock divider
category: required
required: true

clk-source:
type: int
description: system clock source
category: optional
required: false

sosc-freq:
type: int
description: system oscillator (e.g. xtal) frequency
category: optional
required: false

sosc-mode:
type: int
description: system oscillator mode
category: optional
required: false

sosc-divider-1:
type: int
description: system oscillator divider 1
category: optional
required: false

sosc-divider-2:
type: int
description: system oscillator divider 2
category: optional
required: false

sirc-range:
type: int
description: slow internal reference clock range in MHz
category: required
required: true

sirc-divider-1:
type: int
description: slow internal reference clock divider 1
category: required
required: true

sirc-divider-2:
type: int
description: slow internal reference clock divider 2
category: required
required: true

firc-range:
type: int
description: fast internal reference clock range in MHz
category: required
required: true

firc-divider-1:
type: int
description: fast internal reference clock divider 1
category: required
required: true

firc-divider-2:
type: int
description: fast internal reference clock divider 2
category: required
required: true

spll-source:
type: int
description: system phase-locked loop clock source
category: required
required: true

spll-divider-pre:
type: int
description: system phase-locked loop reference clock divider
category: required
required: true

spll-multiplier:
type: int
description: system phase-locked loop reference clock multiplier
category: required
required: true

spll-divider-1:
type: int
description: system phase-locked loop divider 1
category: required
required: true

spll-divider-2:
type: int
description: system phase-locked loop divider 2
category: required
required: true

clkout-source:
type: int
description: clockout clock source
category: optional
required: false

"#clock-cells":
const: 1
Expand Down
10 changes: 5 additions & 5 deletions dts/bindings/arm/nxp,kinetis-sim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ properties:
constraint: "nxp,kinetis-sim"

reg:
category: required
required: true

label:
category: required
required: true

clkout-source:
type: int
category: optional
required: false
description: clkout clock source

clkout-divider:
type: int
category: optional
required: false
description: clkout divider

"#clock-cells":
type: int
category: optional
required: false
const: 3

"#cells":
Expand Down
Loading