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

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

Pull devicetree fixes from Rob Herring:

 - Drop unused 'max-link-speed' in Apple PCIe

 - More redundant 'maxItems/minItems' schema fixes

 - Support values for pinctrl 'drive-push-pull' and 'drive-open-drain'

 - Fix redundant 'unevaluatedProperties' in MT6360 LEDs binding

 - Add missing 'power-domains' property to Cadence UFSHC

* tag 'devicetree-fixes-for-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: pci: apple,pcie: Drop max-link-speed from example
  dt-bindings: Drop redundant 'maxItems/minItems' in if/then schemas
  dt-bindings: pinctrl: Allow values for drive-push-pull and drive-open-drain
  dt-bindings: leds-mt6360: Drop redundant 'unevaluatedProperties'
  dt-bindings: ufs: cdns,ufshc: Add power-domains
parents 0f5d752b 5dc46304

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

+0 −4
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ allOf: 
    then:

      properties:

        clocks:

          minItems: 7

          maxItems: 7

          items:

            - description: 32k osc

            - description: 25m osc
@@ -66,8 +64,6 @@ allOf: 
            - description: ext3 clock input

            - description: ext4 clock input

        clock-names:

          minItems: 7

          maxItems: 7

          items:

            - const: ckil

            - const: osc_25m

Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml

+0 −4
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ then: 
  properties:

    clocks:

      minItems: 1

      maxItems: 4

      items:

        - description: Functional clock

        - description: EXTAL input clock
@@ -104,7 +103,6 @@ then: 


    clock-names:

      minItems: 1

      maxItems: 4

      items:

        - const: fck

        # The LVDS encoder can use the EXTAL or DU_DOTCLKINx clocks.
@@ -128,12 +126,10 @@ then: 
else:

  properties:

    clocks:

      maxItems: 1

      items:

        - description: Functional clock



    clock-names:

      maxItems: 1

      items:

        - const: fck

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

+0 −23
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ allOf: 
      properties:

        clocks:

          minItems: 1

          maxItems: 3

          items:

            - description: Functional clock

            - description: DU_DOTCLKIN0 input clock
@@ -117,7 +116,6 @@ allOf: 


        clock-names:

          minItems: 1

          maxItems: 3

          items:

            - const: du.0

            - pattern: '^dclkin\.[01]$'
@@ -159,7 +157,6 @@ allOf: 
      properties:

        clocks:

          minItems: 2

          maxItems: 4

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -168,7 +165,6 @@ allOf: 


        clock-names:

          minItems: 2

          maxItems: 4

          items:

            - const: du.0

            - const: du.1
@@ -216,7 +212,6 @@ allOf: 
      properties:

        clocks:

          minItems: 2

          maxItems: 4

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -225,7 +220,6 @@ allOf: 


        clock-names:

          minItems: 2

          maxItems: 4

          items:

            - const: du.0

            - const: du.1
@@ -271,7 +265,6 @@ allOf: 
      properties:

        clocks:

          minItems: 2

          maxItems: 4

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -280,7 +273,6 @@ allOf: 


        clock-names:

          minItems: 2

          maxItems: 4

          items:

            - const: du.0

            - const: du.1
@@ -327,7 +319,6 @@ allOf: 
      properties:

        clocks:

          minItems: 2

          maxItems: 4

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -336,7 +327,6 @@ allOf: 


        clock-names:

          minItems: 2

          maxItems: 4

          items:

            - const: du.0

            - const: du.1
@@ -386,7 +376,6 @@ allOf: 
      properties:

        clocks:

          minItems: 3

          maxItems: 6

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -397,7 +386,6 @@ allOf: 


        clock-names:

          minItems: 3

          maxItems: 6

          items:

            - const: du.0

            - const: du.1
@@ -448,7 +436,6 @@ allOf: 
      properties:

        clocks:

          minItems: 4

          maxItems: 8

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -461,7 +448,6 @@ allOf: 


        clock-names:

          minItems: 4

          maxItems: 8

          items:

            - const: du.0

            - const: du.1
@@ -525,7 +511,6 @@ allOf: 
      properties:

        clocks:

          minItems: 3

          maxItems: 6

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -536,7 +521,6 @@ allOf: 


        clock-names:

          minItems: 3

          maxItems: 6

          items:

            - const: du.0

            - const: du.1
@@ -596,7 +580,6 @@ allOf: 
      properties:

        clocks:

          minItems: 3

          maxItems: 6

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -607,7 +590,6 @@ allOf: 


        clock-names:

          minItems: 3

          maxItems: 6

          items:

            - const: du.0

            - const: du.1
@@ -666,14 +648,12 @@ allOf: 
      properties:

        clocks:

          minItems: 1

          maxItems: 2

          items:

            - description: Functional clock for DU0

            - description: DU_DOTCLKIN0 input clock



        clock-names:

          minItems: 1

          maxItems: 2

          items:

            - const: du.0

            - const: dclkin.0
@@ -723,7 +703,6 @@ allOf: 
      properties:

        clocks:

          minItems: 2

          maxItems: 4

          items:

            - description: Functional clock for DU0

            - description: Functional clock for DU1
@@ -732,7 +711,6 @@ allOf: 


        clock-names:

          minItems: 2

          maxItems: 4

          items:

            - const: du.0

            - const: du.1
@@ -791,7 +769,6 @@ allOf: 
            - description: Functional clock



        clock-names:

          maxItems: 1

          items:

            - const: du.0

Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml

+0 −2
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ allOf: 
            - const: bus

            - const: adc

          minItems: 1

          maxItems: 2



        interrupts:

          items:
@@ -170,7 +169,6 @@ allOf: 
            - const: bus

            - const: adc

          minItems: 1

          maxItems: 2



        interrupts:

          items:

Documentation/devicetree/bindings/leds/leds-mt6360.yaml

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ patternProperties: 
          - 4 # LED output FLASH1

          - 5 # LED output FLASH2



unevaluatedProperties: false



required:

  - compatible

  - "#address-cells"