Commit d980cc06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:

 - Drop 'resets' as required on renesas,du

 - Moving of fixed string patterns for 'properties' instead of
   'patternProperties'

 - Drop more redundant minItems/maxItems that we merged in the merge
   window

 - Indentation warning fix for sja1105

* tag 'devicetree-fixes-for-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: display: renesas,du: Make resets optional on R-Car H1
  dt-bindings: Move fixed string 'patternProperties' to 'properties'
  dt-bindings: More dropping redundant minItems/maxItems
  dt-bindings: net: dsa: sja1105: Fix indentation warnings
parents 5f06a790 50d8d7e1
...@@ -50,7 +50,6 @@ properties: ...@@ -50,7 +50,6 @@ properties:
reg: reg:
minItems: 1 minItems: 1
maxItems: 3
items: items:
- description: base register - description: base register
- description: power register - description: power register
......
...@@ -92,7 +92,6 @@ required: ...@@ -92,7 +92,6 @@ required:
- reg - reg
- clocks - clocks
- interrupts - interrupts
- resets
- ports - ports
allOf: allOf:
......
...@@ -39,17 +39,7 @@ properties: ...@@ -39,17 +39,7 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
patternProperties: adi,pwm-active-state:
"^adi,bypass-attenuator-in[0-4]$":
description: |
Configures bypassing the individual voltage input attenuator. If
set to 1 the attenuator is bypassed if set to 0 the attenuator is
not bypassed. If the property is absent then the attenuator
retains it's configuration from the bios/bootloader.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [0, 1]
"^adi,pwm-active-state$":
description: | description: |
Integer array, represents the active state of the pwm outputs If set to 0 Integer array, represents the active state of the pwm outputs If set to 0
the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
...@@ -61,6 +51,16 @@ patternProperties: ...@@ -61,6 +51,16 @@ patternProperties:
enum: [0, 1] enum: [0, 1]
default: 1 default: 1
patternProperties:
"^adi,bypass-attenuator-in[0-4]$":
description: |
Configures bypassing the individual voltage input attenuator. If
set to 1 the attenuator is bypassed if set to 0 the attenuator is
not bypassed. If the property is absent then the attenuator
retains it's configuration from the bios/bootloader.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [0, 1]
required: required:
- compatible - compatible
- reg - reg
......
...@@ -28,14 +28,12 @@ properties: ...@@ -28,14 +28,12 @@ properties:
- description: configuration registers for MMU instance 0 - description: configuration registers for MMU instance 0
- description: configuration registers for MMU instance 1 - description: configuration registers for MMU instance 1
minItems: 1 minItems: 1
maxItems: 2
interrupts: interrupts:
items: items:
- description: interruption for MMU instance 0 - description: interruption for MMU instance 0
- description: interruption for MMU instance 1 - description: interruption for MMU instance 1
minItems: 1 minItems: 1
maxItems: 2
clocks: clocks:
items: items:
......
...@@ -57,7 +57,6 @@ properties: ...@@ -57,7 +57,6 @@ properties:
ranges: ranges:
minItems: 1 minItems: 1
maxItems: 3
description: | description: |
Memory bus areas for interacting with the devices. Reflects Memory bus areas for interacting with the devices. Reflects
the memory layout with four integer values following: the memory layout with four integer values following:
......
...@@ -84,7 +84,6 @@ properties: ...@@ -84,7 +84,6 @@ properties:
interrupts: interrupts:
minItems: 1 minItems: 1
maxItems: 3
items: items:
- description: NAND CTLRDY interrupt - description: NAND CTLRDY interrupt
- description: FLASH_DMA_DONE if flash DMA is available - description: FLASH_DMA_DONE if flash DMA is available
...@@ -92,7 +91,6 @@ properties: ...@@ -92,7 +91,6 @@ properties:
interrupt-names: interrupt-names:
minItems: 1 minItems: 1
maxItems: 3
items: items:
- const: nand_ctlrdy - const: nand_ctlrdy
- const: flash_dma_done - const: flash_dma_done
...@@ -148,8 +146,6 @@ allOf: ...@@ -148,8 +146,6 @@ allOf:
then: then:
properties: properties:
reg-names: reg-names:
minItems: 2
maxItems: 2
items: items:
- const: nand - const: nand
- const: nand-int-base - const: nand-int-base
...@@ -161,8 +157,6 @@ allOf: ...@@ -161,8 +157,6 @@ allOf:
then: then:
properties: properties:
reg-names: reg-names:
minItems: 3
maxItems: 3
items: items:
- const: nand - const: nand
- const: nand-int-base - const: nand-int-base
...@@ -175,8 +169,6 @@ allOf: ...@@ -175,8 +169,6 @@ allOf:
then: then:
properties: properties:
reg-names: reg-names:
minItems: 3
maxItems: 3
items: items:
- const: nand - const: nand
- const: iproc-idm - const: iproc-idm
......
...@@ -67,8 +67,8 @@ properties: ...@@ -67,8 +67,8 @@ properties:
reg: reg:
oneOf: oneOf:
- enum: - enum:
- 0 - 0
- 1 - 1
required: required:
- compatible - compatible
......
...@@ -77,6 +77,34 @@ properties: ...@@ -77,6 +77,34 @@ properties:
Type-C spec states minimum CC pin debounce of 100 ms and maximum Type-C spec states minimum CC pin debounce of 100 ms and maximum
of 200 ms. However, some solutions might need more than 200 ms. of 200 ms. However, some solutions might need more than 200 ms.
refclk-dig:
type: object
description: |
WIZ node should have subnode for refclk_dig to select the reference
clock source for the reference clock used in the PHY and PMA digital
logic.
properties:
clocks:
minItems: 2
maxItems: 4
description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
the inputs to refclk_dig
"#clock-cells":
const: 0
assigned-clocks:
maxItems: 1
assigned-clock-parents:
maxItems: 1
required:
- clocks
- "#clock-cells"
- assigned-clocks
- assigned-clock-parents
patternProperties: patternProperties:
"^pll[0|1]-refclk$": "^pll[0|1]-refclk$":
type: object type: object
...@@ -121,34 +149,6 @@ patternProperties: ...@@ -121,34 +149,6 @@ patternProperties:
- clocks - clocks
- "#clock-cells" - "#clock-cells"
"^refclk-dig$":
type: object
description: |
WIZ node should have subnode for refclk_dig to select the reference
clock source for the reference clock used in the PHY and PMA digital
logic.
properties:
clocks:
minItems: 2
maxItems: 4
description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
the inputs to refclk_dig
"#clock-cells":
const: 0
assigned-clocks:
maxItems: 1
assigned-clock-parents:
maxItems: 1
required:
- clocks
- "#clock-cells"
- assigned-clocks
- assigned-clock-parents
"^serdes@[0-9a-f]+$": "^serdes@[0-9a-f]+$":
type: object type: object
description: | description: |
......
...@@ -36,12 +36,12 @@ properties: ...@@ -36,12 +36,12 @@ properties:
switching frequency must be one of following corresponding value switching frequency must be one of following corresponding value
1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz 1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz
patternProperties: ldortc:
"^ldo[1-4]$":
type: object type: object
$ref: regulator.yaml# $ref: regulator.yaml#
"^ldortc$": patternProperties:
"^ldo[1-4]$":
type: object type: object
$ref: regulator.yaml# $ref: regulator.yaml#
......
...@@ -83,7 +83,8 @@ properties: ...@@ -83,7 +83,8 @@ properties:
unevaluatedProperties: false unevaluatedProperties: false
"^vsnvs$": properties:
vsnvs:
type: object type: object
$ref: regulator.yaml# $ref: regulator.yaml#
description: description:
......
...@@ -30,7 +30,6 @@ properties: ...@@ -30,7 +30,6 @@ properties:
maxItems: 1 maxItems: 1
clocks: clocks:
minItems: 2
items: items:
- description: PCLK clocks - description: PCLK clocks
- description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock - description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock
......
...@@ -79,22 +79,7 @@ properties: ...@@ -79,22 +79,7 @@ properties:
description: description:
The SPI controller acts as a slave, instead of a master. The SPI controller acts as a slave, instead of a master.
allOf: slave:
- if:
not:
required:
- spi-slave
then:
properties:
"#address-cells":
const: 1
else:
properties:
"#address-cells":
const: 0
patternProperties:
"^slave$":
type: object type: object
properties: properties:
...@@ -105,6 +90,7 @@ patternProperties: ...@@ -105,6 +90,7 @@ patternProperties:
required: required:
- compatible - compatible
patternProperties:
"^.*@[0-9a-f]+$": "^.*@[0-9a-f]+$":
type: object type: object
...@@ -180,6 +166,20 @@ patternProperties: ...@@ -180,6 +166,20 @@ patternProperties:
- compatible - compatible
- reg - reg
allOf:
- if:
not:
required:
- spi-slave
then:
properties:
"#address-cells":
const: 1
else:
properties:
"#address-cells":
const: 0
additionalProperties: true additionalProperties: true
examples: examples:
......
...@@ -25,14 +25,12 @@ properties: ...@@ -25,14 +25,12 @@ properties:
interrupts: interrupts:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- description: Host controller interrupt - description: Host controller interrupt
- description: Device controller interrupt in isp1761 - description: Device controller interrupt in isp1761
interrupt-names: interrupt-names:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- const: host - const: host
- const: peripheral - const: peripheral
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment