Commit 95af1e64 authored by Rob Herring (Arm)'s avatar Rob Herring (Arm) Committed by Miquel Raynal
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: default avatarRob Herring (Arm) <robh@kernel.org>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent 002d2fe7
Loading
Loading
Loading
Loading
+6 −14
Original line number Diff line number Diff line
@@ -32,21 +32,13 @@ properties:

patternProperties:
  "^partitions(-boot[12]|-gp[14])?$":
    $ref: /schemas/mtd/partitions/partitions.yaml

    patternProperties:
      "^partition@[0-9a-f]+$":
        $ref: /schemas/mtd/partitions/partition.yaml
    type: object
    additionalProperties: true

    properties:
          reg:
            description: Must be multiple of 512 as it's converted
              internally from bytes to SECTOR_SIZE (512 bytes)

        required:
          - reg

        unevaluatedProperties: false
      compatible:
        contains:
          const: fixed-partitions

required:
  - compatible
+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ properties:
    deprecated: true

  partitions:
    $ref: /schemas/mtd/partitions/partitions.yaml
    type: object

    required:
      - compatible
+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ title: ARM Firmware Suite (AFS) Partitions
maintainers:
  - Linus Walleij <linus.walleij@linaro.org>

select: false

description: |
  The ARM Firmware Suite is a flash partitioning system found on the
  ARM reference designs: Integrator AP, Integrator CP, Versatile AB,
+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ description: |
maintainers:
  - Rafał Miłecki <rafal@milecki.pl>

select: false

properties:
  compatible:
    const: brcm,bcm4908-partitions
+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ description: |
maintainers:
  - Rafał Miłecki <rafal@milecki.pl>

select: false

properties:
  compatible:
    const: brcm,bcm947xx-cfe-partitions
Loading