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

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

Pull devicetree fixes from Rob Herring:
 "Another round of 'allOf' removals and whitespace clean-ups of schemas"

* tag 'devicetree-fixes-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: Remove more cases of 'allOf' containing a '$ref'
  dt-bindings: Whitespace clean-ups in schema files
parents 341323fa 5f0b06da

Documentation/devicetree/bindings/arm/fsl.yaml

+8 −5
Original line number Diff line number Diff line
@@ -273,8 +273,8 @@ properties: 
              - fsl,imx6ull-14x14-evk     # i.MX6 UltraLiteLite 14x14 EVK Board

              - kontron,imx6ull-n6411-som # Kontron N6411 SOM

              - myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board

              - toradex,colibri-imx6ull-eval            # Colibri iMX6ULL Module on Colibri Evaluation Board

              - toradex,colibri-imx6ull-wifi-eval       # Colibri iMX6ULL Wi-Fi / Bluetooth Module on Colibri Evaluation Board

              - toradex,colibri-imx6ull-eval      # Colibri iMX6ULL Module on Colibri Eval Board

              - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board

          - const: fsl,imx6ull



      - description: Kontron N6411 S Board
@@ -312,9 +312,12 @@ properties: 
              - toradex,colibri-imx7d                   # Colibri iMX7 Dual Module

              - toradex,colibri-imx7d-aster             # Colibri iMX7 Dual Module on Aster Carrier Board

              - toradex,colibri-imx7d-emmc              # Colibri iMX7 Dual 1GB (eMMC) Module

              - toradex,colibri-imx7d-emmc-aster        # Colibri iMX7 Dual 1GB (eMMC) Module on Aster Carrier Board

              - toradex,colibri-imx7d-emmc-eval-v3      # Colibri iMX7 Dual 1GB (eMMC) Module on Colibri Evaluation Board V3

              - toradex,colibri-imx7d-eval-v3           # Colibri iMX7 Dual Module on Colibri Evaluation Board V3

              - toradex,colibri-imx7d-emmc-aster        # Colibri iMX7 Dual 1GB (eMMC) Module on

                                                        #  Aster Carrier Board

              - toradex,colibri-imx7d-emmc-eval-v3      # Colibri iMX7 Dual 1GB (eMMC) Module on

                                                        #  Colibri Evaluation Board V3

              - toradex,colibri-imx7d-eval-v3           # Colibri iMX7 Dual Module on

                                                        #  Colibri Evaluation Board V3

              - tq,imx7d-mba7             # i.MX7D TQ MBa7 with TQMa7D SoM

              - zii,imx7d-rmu2            # ZII RMU2 Board

              - zii,imx7d-rpu2            # ZII RPU2 Board

Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ properties: 
      - const: hdmi



  ddc:

    allOf:

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

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

    description: >

      Phandle of the I2C controller used for DDC EDID probing

Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml

+7 −8
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ additionalProperties: false 


examples:

  - |



    #include <dt-bindings/clock/imx8mq-clock.h>

    #include <dt-bindings/gpio/gpio.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

Documentation/devicetree/bindings/display/panel/ilitek,ili9322.yaml

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ properties: 
    items:

      - enum:

          - dlink,dir-685-panel



      - const: ilitek,ili9322



  reset-gpios: true

Documentation/devicetree/bindings/display/panel/ilitek,ili9881c.yaml

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ properties: 
    items:

      - enum:

          - bananapi,lhr050h41



      - const: ilitek,ili9881c



  backlight: true

CRA Git | Maintained and supported by SUSTech CRA and CCSE