Skip to content

Commit 95af1e6

Browse files
robherringmiquelraynal
authored andcommitted
dt-bindings: mtd: partitions: Drop partitions.yaml
The partitions.yaml schema is an unusual structure in that it includes all possible partition types, and it disables the normal matching by compatible strings. As partitions.yaml has nothing to match on, it is only applied when explicitly referenced. The use of "oneOf" also results in misleading warnings which are difficult to understand. Drop partitions.yaml and rely on the standard compatible matching instead. The "mmc-card" case previously allowed any partition type, but now only allows "fixed-partitions". There aren't any users and the original intent appeared to be only for "fixed-partitions". Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Signed-off-by: Rob Herring (Arm) <robh@kernel.org> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
1 parent 002d2fe commit 95af1e6

8 files changed

Lines changed: 10 additions & 60 deletions

File tree

Documentation/devicetree/bindings/mmc/mmc-card.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,13 @@ properties:
3232

3333
patternProperties:
3434
"^partitions(-boot[12]|-gp[14])?$":
35-
$ref: /schemas/mtd/partitions/partitions.yaml
35+
type: object
36+
additionalProperties: true
3637

37-
patternProperties:
38-
"^partition@[0-9a-f]+$":
39-
$ref: /schemas/mtd/partitions/partition.yaml
40-
41-
properties:
42-
reg:
43-
description: Must be multiple of 512 as it's converted
44-
internally from bytes to SECTOR_SIZE (512 bytes)
45-
46-
required:
47-
- reg
48-
49-
unevaluatedProperties: false
38+
properties:
39+
compatible:
40+
contains:
41+
const: fixed-partitions
5042

5143
required:
5244
- compatible

Documentation/devicetree/bindings/mtd/mtd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ properties:
3030
deprecated: true
3131

3232
partitions:
33-
$ref: /schemas/mtd/partitions/partitions.yaml
33+
type: object
3434

3535
required:
3636
- compatible

Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-suite.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ title: ARM Firmware Suite (AFS) Partitions
99
maintainers:
1010
- Linus Walleij <linus.walleij@linaro.org>
1111

12-
select: false
13-
1412
description: |
1513
The ARM Firmware Suite is a flash partitioning system found on the
1614
ARM reference designs: Integrator AP, Integrator CP, Versatile AB,

Documentation/devicetree/bindings/mtd/partitions/brcm,bcm4908-partitions.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ description: |
1717
maintainers:
1818
- Rafał Miłecki <rafal@milecki.pl>
1919

20-
select: false
21-
2220
properties:
2321
compatible:
2422
const: brcm,bcm4908-partitions

Documentation/devicetree/bindings/mtd/partitions/brcm,bcm947xx-cfe-partitions.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ description: |
3535
maintainers:
3636
- Rafał Miłecki <rafal@milecki.pl>
3737

38-
select: false
39-
4038
properties:
4139
compatible:
4240
const: brcm,bcm947xx-cfe-partitions

Documentation/devicetree/bindings/mtd/partitions/linksys,ns-partitions.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ description: |
1818
maintainers:
1919
- Rafał Miłecki <rafal@milecki.pl>
2020

21-
select: false
22-
2321
properties:
2422
compatible:
2523
const: linksys,ns-partitions

Documentation/devicetree/bindings/mtd/partitions/partitions.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.

Documentation/devicetree/bindings/mtd/ti,davinci-nand.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ properties:
2424
- description: AEMIF control registers.
2525

2626
partitions:
27-
$ref: /schemas/mtd/partitions/partitions.yaml
27+
type: object
28+
required:
29+
- compatible
2830

2931
ti,davinci-chipselect:
3032
description:

0 commit comments

Comments
 (0)