Skip to content

Commit 14427d4

Browse files
robherringmiquelraynal
authored andcommitted
dt-bindings: mtd: qcom,nandc: Define properties at top-level
Convention is DT schemas should define all properties at the top-level and not inside of if/then schemas. That minimizes the if/then schemas and is more future proof. There were 2 "if" schemas for "qcom,ipq806x-nand" and the "qcom,boot-partitions: true" unnecessary, so the conditional schemas can be simplified a bit. Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20240625215605.192260-1-robh@kernel.org
1 parent e33df1c commit 14427d4

File tree

1 file changed

+14
-24
lines changed

1 file changed

+14
-24
lines changed

Documentation/devicetree/bindings/mtd/qcom,nandc.yaml

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ properties:
3131
- const: core
3232
- const: aon
3333

34+
qcom,cmd-crci:
35+
$ref: /schemas/types.yaml#/definitions/uint32
36+
description:
37+
Must contain the ADM command type CRCI block instance number specified for
38+
the NAND controller on the given platform
39+
40+
qcom,data-crci:
41+
$ref: /schemas/types.yaml#/definitions/uint32
42+
description:
43+
Must contain the ADM data type CRCI block instance number specified for
44+
the NAND controller on the given platform
45+
3446
patternProperties:
3547
"^nand@[a-f0-9]$":
3648
type: object
@@ -83,18 +95,6 @@ allOf:
8395
items:
8496
- const: rxtx
8597

86-
qcom,cmd-crci:
87-
$ref: /schemas/types.yaml#/definitions/uint32
88-
description:
89-
Must contain the ADM command type CRCI block instance number
90-
specified for the NAND controller on the given platform
91-
92-
qcom,data-crci:
93-
$ref: /schemas/types.yaml#/definitions/uint32
94-
description:
95-
Must contain the ADM data type CRCI block instance number
96-
specified for the NAND controller on the given platform
97-
9898
- if:
9999
properties:
100100
compatible:
@@ -119,19 +119,9 @@ allOf:
119119
- const: rx
120120
- const: cmd
121121

122-
- if:
123-
properties:
124-
compatible:
125-
contains:
126-
enum:
127-
- qcom,ipq806x-nand
122+
qcom,cmd-crci: false
123+
qcom,data-crci: false
128124

129-
then:
130-
patternProperties:
131-
"^nand@[a-f0-9]$":
132-
properties:
133-
qcom,boot-partitions: true
134-
else:
135125
patternProperties:
136126
"^nand@[a-f0-9]$":
137127
properties:

0 commit comments

Comments
 (0)