.../bindings/mmc/marvell,xenon-sdhci.yaml | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-)
Properties are supposed to be defined in the top-level schema and then
disallowed in an if/then schema if necessary. Move the "marvell,pad-type"
property to follow this.
"reg" can also be similarly described at the top-level with only the
number of entries restricted in the if/then schema.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
.../bindings/mmc/marvell,xenon-sdhci.yaml | 48 +++++++++----------
1 file changed, 22 insertions(+), 26 deletions(-)
diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
index cfe6237716f4..3f48d8292d5b 100644
--- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
+++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
@@ -38,15 +38,9 @@ properties:
reg:
minItems: 1
- maxItems: 2
- description: |
- For "marvell,armada-3700-sdhci", two register areas. The first one
- for Xenon IP register. The second one for the Armada 3700 SoC PHY PAD
- Voltage Control register. Please follow the examples with compatible
- "marvell,armada-3700-sdhci" in below.
- Please also check property marvell,pad-type in below.
-
- For other compatible strings, one register area for Xenon IP.
+ items:
+ - description: Xenon IP registers
+ - description: Armada 3700 SoC PHY PAD Voltage Control register
clocks:
minItems: 1
@@ -61,6 +55,17 @@ properties:
interrupts:
maxItems: 1
+ marvell,pad-type:
+ $ref: /schemas/types.yaml#/definitions/string
+ enum:
+ - sd
+ - fixed-1-8v
+ description:
+ Type of Armada 3700 SoC PHY PAD Voltage Controller register. If "sd" is
+ selected, SoC PHY PAD is set as 3.3V at the beginning and is switched to
+ 1.8V when later in higher speed mode. If "fixed-1-8v" is selected, SoC PHY
+ PAD is fixed 1.8V, such as for eMMC.
+
marvell,xenon-sdhc-id:
$ref: /schemas/types.yaml#/definitions/uint32
minimum: 0
@@ -147,27 +152,18 @@ allOf:
then:
properties:
reg:
- items:
- - description: Xenon IP registers
- - description: Armada 3700 SoC PHY PAD Voltage Control register
-
- marvell,pad-type:
- $ref: /schemas/types.yaml#/definitions/string
- enum:
- - sd
- - fixed-1-8v
- description: |
- Type of Armada 3700 SoC PHY PAD Voltage Controller register.
- If "sd" is selected, SoC PHY PAD is set as 3.3V at the beginning
- and is switched to 1.8V when later in higher speed mode.
- If "fixed-1-8v" is selected, SoC PHY PAD is fixed 1.8V, such as for
- eMMC.
- Please follow the examples with compatible
- "marvell,armada-3700-sdhci" in below.
+ minItems: 2
required:
- marvell,pad-type
+ else:
+ properties:
+ reg:
+ maxItems: 1
+
+ marvell,pad-type: false
+
- if:
properties:
compatible:
--
2.45.2On Wed, 13 Nov 2024 at 23:56, Rob Herring (Arm) <robh@kernel.org> wrote: > > Properties are supposed to be defined in the top-level schema and then > disallowed in an if/then schema if necessary. Move the "marvell,pad-type" > property to follow this. > > "reg" can also be similarly described at the top-level with only the > number of entries restricted in the if/then schema. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Applied for next, thanks! Kind regards Uffe > --- > .../bindings/mmc/marvell,xenon-sdhci.yaml | 48 +++++++++---------- > 1 file changed, 22 insertions(+), 26 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > index cfe6237716f4..3f48d8292d5b 100644 > --- a/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > +++ b/Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml > @@ -38,15 +38,9 @@ properties: > > reg: > minItems: 1 > - maxItems: 2 > - description: | > - For "marvell,armada-3700-sdhci", two register areas. The first one > - for Xenon IP register. The second one for the Armada 3700 SoC PHY PAD > - Voltage Control register. Please follow the examples with compatible > - "marvell,armada-3700-sdhci" in below. > - Please also check property marvell,pad-type in below. > - > - For other compatible strings, one register area for Xenon IP. > + items: > + - description: Xenon IP registers > + - description: Armada 3700 SoC PHY PAD Voltage Control register > > clocks: > minItems: 1 > @@ -61,6 +55,17 @@ properties: > interrupts: > maxItems: 1 > > + marvell,pad-type: > + $ref: /schemas/types.yaml#/definitions/string > + enum: > + - sd > + - fixed-1-8v > + description: > + Type of Armada 3700 SoC PHY PAD Voltage Controller register. If "sd" is > + selected, SoC PHY PAD is set as 3.3V at the beginning and is switched to > + 1.8V when later in higher speed mode. If "fixed-1-8v" is selected, SoC PHY > + PAD is fixed 1.8V, such as for eMMC. > + > marvell,xenon-sdhc-id: > $ref: /schemas/types.yaml#/definitions/uint32 > minimum: 0 > @@ -147,27 +152,18 @@ allOf: > then: > properties: > reg: > - items: > - - description: Xenon IP registers > - - description: Armada 3700 SoC PHY PAD Voltage Control register > - > - marvell,pad-type: > - $ref: /schemas/types.yaml#/definitions/string > - enum: > - - sd > - - fixed-1-8v > - description: | > - Type of Armada 3700 SoC PHY PAD Voltage Controller register. > - If "sd" is selected, SoC PHY PAD is set as 3.3V at the beginning > - and is switched to 1.8V when later in higher speed mode. > - If "fixed-1-8v" is selected, SoC PHY PAD is fixed 1.8V, such as for > - eMMC. > - Please follow the examples with compatible > - "marvell,armada-3700-sdhci" in below. > + minItems: 2 > > required: > - marvell,pad-type > > + else: > + properties: > + reg: > + maxItems: 1 > + > + marvell,pad-type: false > + > - if: > properties: > compatible: > -- > 2.45.2 >
On Wed, Nov 13, 2024 at 04:56:01PM -0600, Rob Herring (Arm) wrote: > Properties are supposed to be defined in the top-level schema and then > disallowed in an if/then schema if necessary. Move the "marvell,pad-type" > property to follow this. > > "reg" can also be similarly described at the top-level with only the > number of entries restricted in the if/then schema. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Acked-by: Conor Dooley <conor.dooley@microchip.com>
© 2016 - 2026 Red Hat, Inc.