Commit d980cc06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree fixes from Rob Herring:

 - Drop 'resets' as required on renesas,du

 - Moving of fixed string patterns for 'properties' instead of
   'patternProperties'

 - Drop more redundant minItems/maxItems that we merged in the merge
   window

 - Indentation warning fix for sja1105

* tag 'devicetree-fixes-for-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: display: renesas,du: Make resets optional on R-Car H1
  dt-bindings: Move fixed string 'patternProperties' to 'properties'
  dt-bindings: More dropping redundant minItems/maxItems
  dt-bindings: net: dsa: sja1105: Fix indentation warnings
parents 5f06a790 50d8d7e1

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml

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


  reg:

    minItems: 1

    maxItems: 3

    items:

      - description: base register

      - description: power register

Documentation/devicetree/bindings/display/renesas,du.yaml

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ required: 
  - reg

  - clocks

  - interrupts

  - resets

  - ports



allOf:

Documentation/devicetree/bindings/hwmon/adt7475.yaml

+11 −11
Original line number Diff line number Diff line
@@ -39,17 +39,7 @@ properties: 
  reg:

    maxItems: 1



patternProperties:

  "^adi,bypass-attenuator-in[0-4]$":

    description: |

      Configures bypassing the individual voltage input attenuator. If

      set to 1 the attenuator is bypassed if set to 0 the attenuator is

      not bypassed. If the property is absent then the attenuator

      retains it's configuration from the bios/bootloader.

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

    enum: [0, 1]



  "^adi,pwm-active-state$":

  adi,pwm-active-state:

    description: |

      Integer array, represents the active state of the pwm outputs If set to 0

      the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
@@ -61,6 +51,16 @@ patternProperties: 
      enum: [0, 1]

      default: 1



patternProperties:

  "^adi,bypass-attenuator-in[0-4]$":

    description: |

      Configures bypassing the individual voltage input attenuator. If

      set to 1 the attenuator is bypassed if set to 0 the attenuator is

      not bypassed. If the property is absent then the attenuator

      retains it's configuration from the bios/bootloader.

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

    enum: [0, 1]



required:

  - compatible

  - reg

Documentation/devicetree/bindings/iommu/rockchip,iommu.yaml

+0 −2
Original line number Diff line number Diff line
@@ -28,14 +28,12 @@ properties: 
      - description: configuration registers for MMU instance 0

      - description: configuration registers for MMU instance 1

    minItems: 1

    maxItems: 2



  interrupts:

    items:

      - description: interruption for MMU instance 0

      - description: interruption for MMU instance 1

    minItems: 1

    maxItems: 2



  clocks:

    items:

Documentation/devicetree/bindings/memory-controllers/arm,pl353-smc.yaml

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


  ranges:

    minItems: 1

    maxItems: 3

    description: |

      Memory bus areas for interacting with the devices. Reflects

      the memory layout with four integer values following: