Commit 986536b9 authored by Rob Herring's avatar Rob Herring
Browse files

dt-bindings: Fix array schemas encoded as matrices 



The YAML DT encoding has leaked into some array properties. Properties
which are defined as an array should have a schema that's just an array.
That means there should only be a single level of 'minItems',
'maxItems', and/or 'items'.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Link: https://lore.kernel.org/r/20220119015627.2443334-1-robh@kernel.org
parent 58dfff3e

Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml

+5 −7
Original line number Diff line number Diff line
@@ -81,9 +81,7 @@ properties: 
              data-lanes:

                description:

                  Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines.

                items:

                minItems: 1

                  maxItems: 4

                items:

                  - const: 1

                  - const: 2

Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml

+5 −7
Original line number Diff line number Diff line
@@ -87,9 +87,7 @@ properties: 


            properties:

              data-lanes:

                items:

                minItems: 1

                  maxItems: 4

                items:

                  - const: 1

                  - const: 2

Documentation/devicetree/bindings/net/can/bosch,m_can.yaml

+25 −27
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ properties: 
      Please refer to 2.4.1 Message RAM Configuration in Bosch

      M_CAN user manual for details.

    $ref: /schemas/types.yaml#/definitions/int32-array

    items:

    items:

      - description: The 'offset' is an address offset of the Message RAM where

          the following elements start from. This is usually set to 0x0 if
@@ -102,7 +101,6 @@ properties: 
      - description: Tx Buffers 0-32 elements / 0-576 words

        minimum: 0

        maximum: 32

    maxItems: 1



  power-domains:

    description:

Documentation/devicetree/bindings/net/ethernet-controller.yaml

+27 −32
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ properties: 
    description:

      Specifies the MAC address that was assigned to the network device.

    $ref: /schemas/types.yaml#/definitions/uint8-array

    items:

      - minItems: 6

    minItems: 6

    maxItems: 6



  mac-address:
@@ -28,8 +27,7 @@ properties: 
      to the device by the boot program is different from the

      local-mac-address property.

    $ref: /schemas/types.yaml#/definitions/uint8-array

    items:

      - minItems: 6

    minItems: 6

    maxItems: 6



  max-frame-size:
@@ -164,9 +162,6 @@ properties: 
          type: array

        then:

          deprecated: true

          minItems: 1

          maxItems: 1

          items:

          items:

            - minimum: 0

              maximum: 31

Documentation/devicetree/bindings/nvmem/nvmem.yaml

+8 −9
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ patternProperties: 
          Offset and size in bytes within the storage device.



      bits:

        maxItems: 1

        items:

        $ref: /schemas/types.yaml#/definitions/uint32-array

        items:

          - minimum: 0

            maximum: 7