Commit 4071b856 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull Devicetree fixes from Rob Herring:

 - Another round of whack-a-mole removing 'allOf', redundant cases of
   'maxItems' and incorrect 'reg' sizes

 - Fix support for yaml.h in non-standard paths

* tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: Remove redundant 'maxItems'
  dt-bindings: Fix more incorrect 'reg' property sizes in examples
  dt-bindings: phy: qcom: Fix missing 'ranges' and example addresses
  dt-bindings: Remove more cases of 'allOf' containing a '$ref'
  scripts/dtc: use pkg-config to include <yaml.h> in non-standard path
parents 7de26c41 8440d4a7

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

+2 −3
Original line number Original line Diff line number Diff line
@@ -85,9 +85,8 @@ properties: 
      CPU power good signal from external PMIC to PMC is enabled.

      CPU power good signal from external PMIC to PMC is enabled.





  nvidia,suspend-mode:

  nvidia,suspend-mode:

    allOf:

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

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

    enum: [0, 1, 2]

      - enum: [0, 1, 2]

    description:

    description:

      The suspend mode that the platform should use.

      The suspend mode that the platform should use.

      Mode 0 is for LP0, CPU + Core voltage off and DRAM in self-refresh

      Mode 0 is for LP0, CPU + Core voltage off and DRAM in self-refresh

Documentation/devicetree/bindings/ata/sata_highbank.yaml

+9 −12
Original line number Original line Diff line number Diff line
@@ -40,27 +40,24 @@ properties: 




  calxeda,led-order:

  calxeda,led-order:

    description: Maps port numbers to offsets within the SGPIO bitstream.

    description: Maps port numbers to offsets within the SGPIO bitstream.

    allOf:

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

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

    minItems: 1

      - minItems: 1

    maxItems: 8

    maxItems: 8





  calxeda,port-phys:

  calxeda,port-phys:

    description: |

    description: |

      phandle-combophy and lane assignment, which maps each SATA port to a

      phandle-combophy and lane assignment, which maps each SATA port to a

      combophy and a lane within that combophy

      combophy and a lane within that combophy

    allOf:

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

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

    minItems: 1

      - minItems: 1

    maxItems: 8

    maxItems: 8





  calxeda,tx-atten:

  calxeda,tx-atten:

    description: |

    description: |

      Contains TX attenuation override codes, one per port.

      Contains TX attenuation override codes, one per port.

      The upper 24 bits of each entry are always 0 and thus ignored.

      The upper 24 bits of each entry are always 0 and thus ignored.

    allOf:

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

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

    minItems: 1

      - minItems: 1

    maxItems: 8

    maxItems: 8





  calxeda,sgpio-gpio:

  calxeda,sgpio-gpio:

Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml

+2 −2
Original line number Original line Diff line number Diff line
@@ -71,8 +71,8 @@ examples: 




    bus@1f059000 {

    bus@1f059000 {

      compatible = "baikal,bt1-apb", "simple-bus";

      compatible = "baikal,bt1-apb", "simple-bus";

      reg = <0 0x1f059000 0 0x1000>,

      reg = <0x1f059000 0x1000>,

            <0 0x1d000000 0 0x2040000>;

            <0x1d000000 0x2040000>;

      reg-names = "ehb", "nodev";

      reg-names = "ehb", "nodev";

      #address-cells = <1>;

      #address-cells = <1>;

      #size-cells = <1>;

      #size-cells = <1>;

Documentation/devicetree/bindings/bus/baikal,bt1-axi.yaml

+2 −2
Original line number Original line Diff line number Diff line
@@ -85,8 +85,8 @@ examples: 




    bus@1f05a000 {

    bus@1f05a000 {

      compatible = "baikal,bt1-axi", "simple-bus";

      compatible = "baikal,bt1-axi", "simple-bus";

      reg = <0 0x1f05a000 0 0x1000>,

      reg = <0x1f05a000 0x1000>,

            <0 0x1f04d110 0 0x8>;

            <0x1f04d110 0x8>;

      reg-names = "qos", "ehb";

      reg-names = "qos", "ehb";

      #address-cells = <1>;

      #address-cells = <1>;

      #size-cells = <1>;

      #size-cells = <1>;

Documentation/devicetree/bindings/clock/imx6q-clock.yaml

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ properties: 
    items:

    items:

      - description: CCM interrupt request 1

      - description: CCM interrupt request 1

      - description: CCM interrupt request 2

      - description: CCM interrupt request 2

    maxItems: 2





  '#clock-cells':

  '#clock-cells':

    const: 1

    const: 1

CRA Git | Maintained and supported by SUSTech CRA and CCSE