Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c529cbb5 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

i.MX DT bindings for 5.3:
 - Add vendor prefix for Purism SPC.
 - Add bindings for i.MX8MQ EVK Board, Purism Librem5 devkit and i.MX7
   Meerkat96 Board.
 - Add LS1028A specific compatible into qDMA bindings doc.
 - Move Emtrion i.MX6 board bindings to schema.
 - Add missing schemas for i.MX7ULP and i.MX1/31/35 bindings.

* tag 'imx-bindings-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  dt-bindings: arm: fsl: Add missing schemas for i.MX1/31/35
  dt-bindings: arm: fsl: Add back missing i.MX7ULP binding
  dt-bindings: arm: Move Emtrion i.MX6 board bindings to schema
  dt-bindings: arm: fsl: Add the imx8mq boards
  dt-bindings: Add an entry for Purism SPC
  dt-bindings: fsl-qdma: Add LS1028A qDMA bindings
  dt-bindings: arm: Document 96Boards Meerkat96 devicetree binding

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 27661070 a10ecf62

Documentation/devicetree/bindings/arm/emtrion.txt

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
Emtrion Devicetree Bindings

===========================



emCON Series:

-------------



Required root node properties

	- compatible:

	- "emtrion,emcon-mx6", "fsl,imx6q"; 		: emCON-MX6D or emCON-MX6Q SoM

	- "emtrion,emcon-mx6-avari", "fsl,imx6q";	: emCON-MX6D or emCON-MX6Q SoM on Avari Base

	- "emtrion,emcon-mx6", "fsl,imx6dl"; 		: emCON-MX6S or emCON-MX6DL SoM

	- "emtrion,emcon-mx6-avari", "fsl,imx6dl";	: emCON-MX6S or emCON-MX6DL SoM on Avari Base

Documentation/devicetree/bindings/arm/fsl.yaml

+44 −0
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ properties: 
    const: '/'

  compatible:

    oneOf:

      - description: i.MX1 based Boards

        items:

          - enum:

              - armadeus,imx1-apf9328

              - fsl,imx1ads

          - const: fsl,imx1



      - description: i.MX23 based Boards

        items:

          - enum:
@@ -51,6 +58,25 @@ properties: 
          - const: i2se,duckbill-2

          - const: fsl,imx28



      - description: i.MX31 based Boards

        items:

          - enum:

              - buglabs,imx31-bug

              - logicpd,imx31-lite

          - const: fsl,imx31



      - description: i.MX35 based Boards

        items:

          - enum:

              - fsl,imx35-pdk

          - const: fsl,imx35



      - description: i.MX35 Eukrea CPUIMX35 Board

        items:

          - const: eukrea,mbimxsd35-baseboard

          - const: eukrea,cpuimx35

          - const: fsl,imx35



      - description: i.MX50 based Boards

        items:

          - enum:
@@ -80,6 +106,8 @@ properties: 
      - description: i.MX6Q based Boards

        items:

          - enum:

              - emtrion,emcon-mx6         # emCON-MX6D or emCON-MX6Q SoM

              - emtrion,emcon-mx6-avari   # emCON-MX6D or emCON-MX6Q SoM on Avari Base

              - fsl,imx6q-arm2

              - fsl,imx6q-sabreauto

              - fsl,imx6q-sabrelite
@@ -99,6 +127,8 @@ properties: 
        items:

          - enum:

              - eckelmann,imx6dl-ci4x10

              - emtrion,emcon-mx6         # emCON-MX6S or emCON-MX6DL SoM

              - emtrion,emcon-mx6-avari   # emCON-MX6S or emCON-MX6DL SoM on Avari Base

              - fsl,imx6dl-sabreauto      # i.MX6 DualLite/Solo SABRE Automotive Board

              - fsl,imx6dl-sabresd        # i.MX6 DualLite SABRE Smart Device Board

              - technologic,imx6dl-ts4900
@@ -156,6 +186,7 @@ properties: 
        items:

          - enum:

              - fsl,imx7d-sdb             # i.MX7 SabreSD Board

              - novtech,imx7d-meerkat96   # i.MX7 Meerkat96 Board

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

              - zii,imx7d-rpu2            # ZII RPU2 Board

          - const: fsl,imx7d
@@ -171,12 +202,25 @@ properties: 
          - const: compulab,cl-som-imx7

          - const: fsl,imx7d



      - description: i.MX7ULP based Boards

        items:

          - enum:

              - fsl,imx7ulp-evk           # i.MX7ULP Evaluation Kit

          - const: fsl,imx7ulp



      - description: i.MX8MM based Boards

        items:

          - enum:

              - fsl,imx8mm-evk            # i.MX8MM EVK Board

          - const: fsl,imx8mm



      - description: i.MX8MQ based Boards

        items:

          - enum:

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

              - purism,librem5-devkit     # Purism Librem5 devkit

          - const: fsl,imx8mq



      - description: i.MX8QXP based Boards

        items:

          - enum:

Documentation/devicetree/bindings/dma/fsl-qdma.txt

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


- compatible:		Must be one of

			 "fsl,ls1021a-qdma": for LS1021A Board

			 "fsl,ls1028a-qdma": for LS1028A Board

			 "fsl,ls1043a-qdma": for ls1043A Board

			 "fsl,ls1046a-qdma": for ls1046A Board

- reg:			Should contain the register's base address and length.

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -685,6 +685,8 @@ patternProperties: 
    description: PROBOX2 (by W2COMP Co., Ltd.)

  "^pulsedlight,.*":

    description: PulsedLight, Inc

  "^purism,.*":

    description: Purism, SPC

  "^qca,.*":

    description: Qualcomm Atheros, Inc.

  "^qcom,.*":