Unverified Commit fe3be994 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-bindings-5.15' of... 

Merge tag 'imx-bindings-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt

i.MX DT bindings update for 5.15:

- Add vendor prefix for MNT Research GmbH, SKOV A/S and Traverse
  Technologies.
- Add compatible for Nitrogen8 SoM, MNT Reform2, Traverse Ten64,
  SKOV i.MX6, SolidSense and i.MX8M GW7902 boards.
- Add compatible for i.MX8QM JPEG codec.

* tag 'imx-bindings-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: arm: fsl: Add Traverse Ten64 (LS1088A) board
  dt-bindings: vendor-prefixes: add Traverse Technologies
  dt-bindings: arm: fsl: add SKOV imx6q and imx6dl based boards
  dt-bindings: vendor-prefixes: Add an entry for SKOV A/S
  dt-bindings: arm: imx: add imx8mm/imx8mn GW7902 support
  dt-bindings: arm: fsl: Add DHCOM PicoITX and DHCOM DRC02 boards
  dt-bindings: arm: fsl: add SolidSense boards
  dt-bindings: media: imx-jpeg: Add compatible for i.MX8QM JPEG codec
  dt-bindings: arm: fsl: add MNT Reform2 board
  dt-bindings: vendor-prefixes: add mntre
  dt-bindings: arm: fsl: add Nitrogen8 SoM

Link: https://lore.kernel.org/r/20210814133853.9981-1-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1de48932 0fdedc09

Documentation/devicetree/bindings/arm/fsl.yaml

+29 −0
Original line number Diff line number Diff line
@@ -221,9 +221,13 @@ properties: 
              - prt,prti6q                # Protonic PRTI6Q board

              - prt,prtwd2                # Protonic WD2 board

              - rex,imx6q-rex-pro         # Rex Pro i.MX6 Quad Board

              - skov,imx6q-skov-revc-lt2  # SKOV IMX6 CPU QuadCore lt2

              - skov,imx6q-skov-revc-lt6  # SKOV IMX6 CPU QuadCore lt6

              - skov,imx6q-skov-reve-mi1010ait-1cp1 # SKOV IMX6 CPU QuadCore mi1010ait-1cp1

              - solidrun,cubox-i/q        # SolidRun Cubox-i Dual/Quad

              - solidrun,hummingboard/q

              - solidrun,hummingboard2/q

              - solidrun,solidsense/q     # SolidRun SolidSense Dual/Quad

              - tbs,imx6q-tbs2910         # TBS2910 Matrix ARM mini PC

              - technexion,imx6q-pico-dwarf   # TechNexion i.MX6Q Pico-Dwarf

              - technexion,imx6q-pico-hobbit  # TechNexion i.MX6Q Pico-Hobbit
@@ -377,9 +381,12 @@ properties: 
              - prt,prtvt7                # Protonic VT7 board

              - rex,imx6dl-rex-basic      # Rex Basic i.MX6 Dual Lite Board

              - riot,imx6s-riotboard      # RIoTboard i.MX6S

              - skov,imx6dl-skov-revc-lt2 # SKOV IMX6 CPU SoloCore lt2

              - skov,imx6dl-skov-revc-lt6 # SKOV IMX6 CPU SoloCore lt6

              - solidrun,cubox-i/dl            # SolidRun Cubox-i Solo/DualLite

              - solidrun,hummingboard/dl

              - solidrun,hummingboard2/dl      # SolidRun HummingBoard2 Solo/DualLite

              - solidrun,solidsense/dl         # SolidRun SolidSense Solo/DualLite

              - technexion,imx6dl-pico-dwarf   # TechNexion i.MX6DL Pico-Dwarf

              - technexion,imx6dl-pico-hobbit  # TechNexion i.MX6DL Pico-Hobbit

              - technexion,imx6dl-pico-nymph   # TechNexion i.MX6DL Pico-Nymph
@@ -418,6 +425,12 @@ properties: 
          - const: dfi,fs700e-m60

          - const: fsl,imx6dl



      - description: i.MX6DL DHCOM PicoITX Board

        items:

          - const: dh,imx6dl-dhcom-picoitx

          - const: dh,imx6dl-dhcom-som

          - const: fsl,imx6dl



      - description: i.MX6DL Gateworks Ventana Boards

        items:

          - enum:
@@ -469,6 +482,12 @@ properties: 
          - const: toradex,colibri_imx6dl          # Colibri iMX6 Module

          - const: fsl,imx6dl



      - description: i.MX6S DHCOM DRC02 Board

        items:

          - const: dh,imx6s-dhcom-drc02

          - const: dh,imx6s-dhcom-som

          - const: fsl,imx6dl



      - description: i.MX6SL based Boards

        items:

          - enum:
@@ -698,6 +717,7 @@ properties: 
              - gw,imx8mm-gw72xx-0x       # i.MX8MM Gateworks Development Kit

              - gw,imx8mm-gw73xx-0x       # i.MX8MM Gateworks Development Kit

              - gw,imx8mm-gw7901          # i.MX8MM Gateworks Board

              - gw,imx8mm-gw7902          # i.MX8MM Gateworks Board

              - kontron,imx8mm-n801x-som  # i.MX8MM Kontron SL (N801X) SOM

              - variscite,var-som-mx8mm   # i.MX8MM Variscite VAR-SOM-MX8MM module

          - const: fsl,imx8mm
@@ -728,6 +748,7 @@ properties: 
              - beacon,imx8mn-beacon-kit  # i.MX8MN Beacon Development Kit

              - fsl,imx8mn-ddr4-evk       # i.MX8MN DDR4 EVK Board

              - fsl,imx8mn-evk            # i.MX8MN LPDDR4 EVK Board

              - gw,imx8mn-gw7902          # i.MX8MM Gateworks Board

          - const: fsl,imx8mn



      - description: Variscite VAR-SOM-MX8MN based boards
@@ -752,10 +773,12 @@ properties: 
        items:

          - enum:

              - boundary,imx8mq-nitrogen8m # i.MX8MQ NITROGEN Board

              - boundary,imx8mq-nitrogen8m-som # i.MX8MQ NITROGEN SoM

              - einfochips,imx8mq-thor96  # i.MX8MQ Thor96 Board

              - fsl,imx8mq-evk            # i.MX8MQ EVK Board

              - google,imx8mq-phanbell    # Google Coral Edge TPU

              - kontron,pitx-imx8m        # Kontron pITX-imx8m Board

              - mntre,reform2             # MNT Reform2 Laptop

              - purism,librem5-devkit     # Purism Librem5 devkit

              - solidrun,hummingboard-pulse # SolidRun Hummingboard Pulse

              - technexion,pico-pi-imx8m  # TechNexion PICO-PI-8M evk
@@ -973,6 +996,12 @@ properties: 
              - fsl,s32v234-evb           # S32V234-EVB2 Customer Evaluation Board

          - const: fsl,s32v234



      - description: Traverse LS1088A based Boards

        items:

          - enum:

              - traverse,ten64            # Ten64 Networking Appliance / Board

          - const: fsl,ls1088a



additionalProperties: true



...

Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml

+12 −7
Original line number Diff line number Diff line
@@ -16,12 +16,17 @@ description: |- 


properties:

  compatible:

    items:

      - enum:

            # JPEG decoder

    oneOf:

      - items:

          enum:

            - nxp,imx8qxp-jpgdec

            # JPEG encoder

            - nxp,imx8qxp-jpgenc

      - items:

          - const: nxp,imx8qm-jpgdec

          - const: nxp,imx8qxp-jpgdec

      - items:

          - const: nxp,imx8qm-jpgenc

          - const: nxp,imx8qxp-jpgenc



  reg:

    maxItems: 1
@@ -69,7 +74,7 @@ examples: 
    };



    jpegenc: jpegenc@58450000 {

        compatible = "nxp,imx8qxp-jpgenc";

        compatible = "nxp,imx8qm-jpgenc", "nxp,imx8qxp-jpgenc";

        reg = <0x58450000 0x00050000 >;

        interrupts = <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>,

                     <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>,

Documentation/devicetree/bindings/vendor-prefixes.yaml

+6 −0
Original line number Diff line number Diff line
@@ -735,6 +735,8 @@ patternProperties: 
    description: MiraMEMS Sensing Technology Co., Ltd.

  "^mitsubishi,.*":

    description: Mitsubishi Electric Corporation

  "^mntre,.*":

    description: MNT Research GmbH

  "^modtronix,.*":

    description: Modtronix Engineering

  "^mosaixtech,.*":
@@ -1066,6 +1068,8 @@ patternProperties: 
    description: Silicon Integrated Systems Corp.

  "^sitronix,.*":

    description: Sitronix Technology Corporation

  "^skov,.*":

    description: SKOV A/S

  "^skyworks,.*":

    description: Skyworks Solutions, Inc.

  "^smartlabs,.*":
@@ -1184,6 +1188,8 @@ patternProperties: 
    description: TPO

  "^tq,.*":

    description: TQ-Systems GmbH

  "^traverse,.*":

    description: Traverse Technologies Australia Pty Ltd

  "^tronfy,.*":

    description: Tronfy

  "^tronsmart,.*":