tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

dt-bindings: mmc: marvell,xenon-sdhci: Simplify Armada 3700 if/then schema

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>
Message-ID: <20241113225602.1782573-1-robh@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Rob Herring (Arm) and committed by
Ulf Hansson 5feebfb4 a2a44f8d

+22 -26
+22 -26
Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
··· 38 38 39 39 reg: 40 40 minItems: 1 41 - maxItems: 2 42 - description: | 43 - For "marvell,armada-3700-sdhci", two register areas. The first one 44 - for Xenon IP register. The second one for the Armada 3700 SoC PHY PAD 45 - Voltage Control register. Please follow the examples with compatible 46 - "marvell,armada-3700-sdhci" in below. 47 - Please also check property marvell,pad-type in below. 48 - 49 - For other compatible strings, one register area for Xenon IP. 41 + items: 42 + - description: Xenon IP registers 43 + - description: Armada 3700 SoC PHY PAD Voltage Control register 50 44 51 45 clocks: 52 46 minItems: 1 ··· 54 60 55 61 interrupts: 56 62 maxItems: 1 63 + 64 + marvell,pad-type: 65 + $ref: /schemas/types.yaml#/definitions/string 66 + enum: 67 + - sd 68 + - fixed-1-8v 69 + description: 70 + Type of Armada 3700 SoC PHY PAD Voltage Controller register. If "sd" is 71 + selected, SoC PHY PAD is set as 3.3V at the beginning and is switched to 72 + 1.8V when later in higher speed mode. If "fixed-1-8v" is selected, SoC PHY 73 + PAD is fixed 1.8V, such as for eMMC. 57 74 58 75 marvell,xenon-sdhc-id: 59 76 $ref: /schemas/types.yaml#/definitions/uint32 ··· 152 147 then: 153 148 properties: 154 149 reg: 155 - items: 156 - - description: Xenon IP registers 157 - - description: Armada 3700 SoC PHY PAD Voltage Control register 158 - 159 - marvell,pad-type: 160 - $ref: /schemas/types.yaml#/definitions/string 161 - enum: 162 - - sd 163 - - fixed-1-8v 164 - description: | 165 - Type of Armada 3700 SoC PHY PAD Voltage Controller register. 166 - If "sd" is selected, SoC PHY PAD is set as 3.3V at the beginning 167 - and is switched to 1.8V when later in higher speed mode. 168 - If "fixed-1-8v" is selected, SoC PHY PAD is fixed 1.8V, such as for 169 - eMMC. 170 - Please follow the examples with compatible 171 - "marvell,armada-3700-sdhci" in below. 150 + minItems: 2 172 151 173 152 required: 174 153 - marvell,pad-type 154 + 155 + else: 156 + properties: 157 + reg: 158 + maxItems: 1 159 + 160 + marvell,pad-type: false 175 161 176 162 - if: 177 163 properties: