Skip to content

Commit

Permalink
spi: dt-bindings: amlogic, meson-gx-spicc: Fix schema for meson-g12a
Browse files Browse the repository at this point in the history
spi@13000: clock-names: Additional items are not allowed ('pclk' was unexpected)
spi@13000: clock-names: ['core', 'pclk'] is too long
spi@13000: clocks: [[2, 23], [2, 258]] is too long
spi@15000: clock-names: Additional items are not allowed ('pclk' was unexpected)
spi@15000: clock-names: ['core', 'pclk'] is too long
spi@15000: clocks: [[2, 29], [2, 261]] is too long

Conditional schema properties don't overwrite others. Instead of
restrictions have to be validated. So general clock amount is 1-2 and
depending on the actual device type limit the mount to 1 or 2.

Signed-off-by: Alexander Stein <alexander.stein@mailbox.org>
Link: https://lore.kernel.org/r/20200609165527.55183-1-alexander.stein@mailbox.org
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Alexander Stein authored and Mark Brown committed Jun 10, 2020
1 parent e0fe700 commit a575357
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,15 @@ properties:
maxItems: 1

clocks:
maxItems: 1
minItems: 1
maxItems: 2
items:
- description: controller register bus clock
- description: baud rate generator and delay control clock

clock-names:
description: input clock for the baud rate generator
items:
- const: core
minItems: 1
maxItems: 2

if:
properties:
Expand All @@ -51,17 +54,22 @@ if:
then:
properties:
clocks:
contains:
items:
- description: controller register bus clock
- description: baud rate generator and delay control clock
minItems: 2

clock-names:
minItems: 2
items:
- const: core
- const: pclk

else:
properties:
clocks:
maxItems: 1

clock-names:
items:
- const: core

required:
- compatible
- reg
Expand Down

0 comments on commit a575357

Please sign in to comment.