mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
Devicetree fixes for v5.14, take 1:
- 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 -----BEGIN PGP SIGNATURE----- iQJEBAABCgAuFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmDxykcQHHJvYmhAa2Vy bmVsLm9yZwAKCRD6+121jbxhw8gdD/987qV7mZ7VTeY8zapLW2hILsNhFyePgy+5 p539p8iE1H3Ihu/RST8lCh60tUdClH4lbspWzUarf1YG+tpwAVOgAgeNz96/0Wqm 25hyX7XzR5Ja/hCaMm2FbEVw4M8A/L6eXvoVo8uuNy+oO9ZueL20hQqFg1Q/wdHP G250wWiyS5hAosFRTM/KjuXbz5xzAPmMGKCWw3GOchkf0RRyuU4e+p9x+cv3Jpsk QJulDcEbr0j12y73V5m25VT5eWL5omH4iFPr+SEVZz+8iYZSUjnRIahJqe9RbElx k4udL9qL7oPdQufW7ITCKtkBE4AgPNEUdgTK0o0ZZhwTHbyITr+o3zaKaYMvjxj1 fwoY4OX5gKy0vIJ854p1cZzbvx1NbnFlrFfN0ByfEsM99ekc0zDNvnRq/m3/+rvc Eu4Ekydmhl9imRNA+L2fZ1ccFLlfnQERZGHPtFH4f88zp3hIJckxCgf5qEnt7x+V lqTDFSzsAgSK14aQOb1HvhVq0whWcwanXJjkDNUCAcrUZzCtTusxzHNXIB0zNOpK VxQ6ZzF1szTfkWr6X7Bf27wfNr9N02f/SuJJ4LWSWE4QxwlXOMZKXZlZEwz5hag/ Bm4IqJNQL6ppcbAjL9Mgn5BzuXTlhpxRK0CCyHb1ed+tCR5oAMtIajA4INU4hS8E SXM9fjVYXw== =EiRx -----END PGP SIGNATURE----- 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
This commit is contained in:
Linus Torvalds
commit
d980cc0620
13 changed files with 62 additions and 77 deletions
|
|
@ -50,7 +50,6 @@ properties:
|
|||
|
||||
reg:
|
||||
minItems: 1
|
||||
maxItems: 3
|
||||
items:
|
||||
- description: base register
|
||||
- description: power register
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ required:
|
|||
- reg
|
||||
- clocks
|
||||
- interrupts
|
||||
- resets
|
||||
- ports
|
||||
|
||||
allOf:
|
||||
|
|
|
|||
|
|
@ -39,17 +39,7 @@ properties:
|
|||
reg:
|
||||
maxItems: 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]
|
||||
|
||||
"^adi,pwm-active-state$":
|
||||
adi,pwm-active-state:
|
||||
description: |
|
||||
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
|
||||
|
|
@ -61,6 +51,16 @@ patternProperties:
|
|||
enum: [0, 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:
|
||||
- compatible
|
||||
- reg
|
||||
|
|
|
|||
|
|
@ -28,14 +28,12 @@ properties:
|
|||
- description: configuration registers for MMU instance 0
|
||||
- description: configuration registers for MMU instance 1
|
||||
minItems: 1
|
||||
maxItems: 2
|
||||
|
||||
interrupts:
|
||||
items:
|
||||
- description: interruption for MMU instance 0
|
||||
- description: interruption for MMU instance 1
|
||||
minItems: 1
|
||||
maxItems: 2
|
||||
|
||||
clocks:
|
||||
items:
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ properties:
|
|||
|
||||
ranges:
|
||||
minItems: 1
|
||||
maxItems: 3
|
||||
description: |
|
||||
Memory bus areas for interacting with the devices. Reflects
|
||||
the memory layout with four integer values following:
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ properties:
|
|||
|
||||
interrupts:
|
||||
minItems: 1
|
||||
maxItems: 3
|
||||
items:
|
||||
- description: NAND CTLRDY interrupt
|
||||
- description: FLASH_DMA_DONE if flash DMA is available
|
||||
|
|
@ -92,7 +91,6 @@ properties:
|
|||
|
||||
interrupt-names:
|
||||
minItems: 1
|
||||
maxItems: 3
|
||||
items:
|
||||
- const: nand_ctlrdy
|
||||
- const: flash_dma_done
|
||||
|
|
@ -148,8 +146,6 @@ allOf:
|
|||
then:
|
||||
properties:
|
||||
reg-names:
|
||||
minItems: 2
|
||||
maxItems: 2
|
||||
items:
|
||||
- const: nand
|
||||
- const: nand-int-base
|
||||
|
|
@ -161,8 +157,6 @@ allOf:
|
|||
then:
|
||||
properties:
|
||||
reg-names:
|
||||
minItems: 3
|
||||
maxItems: 3
|
||||
items:
|
||||
- const: nand
|
||||
- const: nand-int-base
|
||||
|
|
@ -175,8 +169,6 @@ allOf:
|
|||
then:
|
||||
properties:
|
||||
reg-names:
|
||||
minItems: 3
|
||||
maxItems: 3
|
||||
items:
|
||||
- const: nand
|
||||
- const: iproc-idm
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@ properties:
|
|||
reg:
|
||||
oneOf:
|
||||
- enum:
|
||||
- 0
|
||||
- 1
|
||||
- 0
|
||||
- 1
|
||||
|
||||
required:
|
||||
- compatible
|
||||
|
|
|
|||
|
|
@ -77,6 +77,34 @@ properties:
|
|||
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.
|
||||
|
||||
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:
|
||||
"^pll[0|1]-refclk$":
|
||||
type: object
|
||||
|
|
@ -121,34 +149,6 @@ patternProperties:
|
|||
- clocks
|
||||
- "#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]+$":
|
||||
type: object
|
||||
description: |
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@ properties:
|
|||
switching frequency must be one of following corresponding value
|
||||
1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz
|
||||
|
||||
patternProperties:
|
||||
"^ldo[1-4]$":
|
||||
ldortc:
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
|
||||
"^ldortc$":
|
||||
patternProperties:
|
||||
"^ldo[1-4]$":
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,8 @@ properties:
|
|||
|
||||
unevaluatedProperties: false
|
||||
|
||||
"^vsnvs$":
|
||||
properties:
|
||||
vsnvs:
|
||||
type: object
|
||||
$ref: regulator.yaml#
|
||||
description:
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ properties:
|
|||
maxItems: 1
|
||||
|
||||
clocks:
|
||||
minItems: 2
|
||||
items:
|
||||
- description: PCLK clocks
|
||||
- description: EXTCLK clocks. Faraday calls it CLK1HZ and says the clock
|
||||
|
|
|
|||
|
|
@ -79,22 +79,7 @@ properties:
|
|||
description:
|
||||
The SPI controller acts as a slave, instead of a master.
|
||||
|
||||
allOf:
|
||||
- if:
|
||||
not:
|
||||
required:
|
||||
- spi-slave
|
||||
then:
|
||||
properties:
|
||||
"#address-cells":
|
||||
const: 1
|
||||
else:
|
||||
properties:
|
||||
"#address-cells":
|
||||
const: 0
|
||||
|
||||
patternProperties:
|
||||
"^slave$":
|
||||
slave:
|
||||
type: object
|
||||
|
||||
properties:
|
||||
|
|
@ -105,6 +90,7 @@ patternProperties:
|
|||
required:
|
||||
- compatible
|
||||
|
||||
patternProperties:
|
||||
"^.*@[0-9a-f]+$":
|
||||
type: object
|
||||
|
||||
|
|
@ -180,6 +166,20 @@ patternProperties:
|
|||
- compatible
|
||||
- reg
|
||||
|
||||
allOf:
|
||||
- if:
|
||||
not:
|
||||
required:
|
||||
- spi-slave
|
||||
then:
|
||||
properties:
|
||||
"#address-cells":
|
||||
const: 1
|
||||
else:
|
||||
properties:
|
||||
"#address-cells":
|
||||
const: 0
|
||||
|
||||
additionalProperties: true
|
||||
|
||||
examples:
|
||||
|
|
|
|||
|
|
@ -25,14 +25,12 @@ properties:
|
|||
|
||||
interrupts:
|
||||
minItems: 1
|
||||
maxItems: 2
|
||||
items:
|
||||
- description: Host controller interrupt
|
||||
- description: Device controller interrupt in isp1761
|
||||
|
||||
interrupt-names:
|
||||
minItems: 1
|
||||
maxItems: 2
|
||||
items:
|
||||
- const: host
|
||||
- const: peripheral
|
||||
|
|
|
|||
Loading…
Reference in a new issue