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

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

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

i.MX DT bindings update for 5.10:

- Various board compatible string additions to fsl.ymal.
- Update Vybrid OCOTP binding for syscon compatible string, which is
  required to access the UID.

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

:
  dt-bindings: arm: fsl: Add binding for Variscite Symphony board with VAR-SOM-MX8MN
  dt-bindings: arm: fsl: Add PHYTEC i.MX6 devicetree bindings
  dt-bindings: arm: fsl: Add PHYTEC i.MX6 UL/ULL devicetree bindings
  dt-bindings: arm: fsl: Add an entry for the i.MX6 LogicPD board
  dt-bindings: arm: fsl: Fix matching Purism Librem5 phones
  dt-bindings: arm: fsl: Add imx8mm ddr4 evk board
  dt-bindings: arm: fsl: add compatible string for Tolino Shine 2 HD
  dt-bindings: nvmem: Add syscon to Vybrid OCOTP driver
  dt-bindings: arm: fsl: Add binding for Variscite Symphony board with VAR-SOM-MX8MM
  dt-bindings: arm: fsl: Add binding for Variscite VAR-SOM-MX8MM module
  dt-bindings: arm: fsl: Add ZII Ultra boards binding
  dt-bindings: arm: fsl: Fix Toradex Colibri i.MX 8 binding
  dt-bindings: arm: fsl: Add Beacon i.MX8M Mini Development Kit binding
  dt-bindings: arm: fsl: Add the librem 5 phone
  dt-bindings: arm: fsl: Add Y Soft IOTA Orion board

Link: https://lore.kernel.org/r/20200923073009.23678-3-shawnguo@kernel.org
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5310d705 8e5910d2

Documentation/devicetree/bindings/arm/fsl.yaml

+95 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ properties: 
              - fsl,imx6q-sabrelite

              - fsl,imx6q-sabresd

              - kontron,imx6q-samx6i      # Kontron i.MX6 Dual/Quad SMARC Module

              - logicpd,imx6q-logicpd

              - prt,prti6q                # Protonic PRTI6Q board

              - prt,prtwd2                # Protonic WD2 board

              - technexion,imx6q-pico-dwarf   # TechNexion i.MX6Q Pico-Dwarf
@@ -156,6 +157,21 @@ properties: 
          - const: gw,ventana

          - const: fsl,imx6q



      - description: i.MX6Q PHYTEC phyBOARD-Mira

        items:

          - enum:

              - phytec,imx6q-pbac06-emmc  # PHYTEC phyBOARD-Mira eMMC RDK

              - phytec,imx6q-pbac06-nand  # PHYTEC phyBOARD-Mira NAND RDK

          - const: phytec,imx6q-pbac06    # PHYTEC phyBOARD-Mira

          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6q



      - description: i.MX6Q PHYTEC phyFLEX-i.MX6

        items:

          - const: phytec,imx6q-pbab01    # PHYTEC phyFLEX carrier board

          - const: phytec,imx6q-pfla02    # PHYTEC phyFLEX-i.MX6 Quad

          - const: fsl,imx6q



      - description: i.MX6QP based Boards

        items:

          - enum:
@@ -163,6 +179,13 @@ properties: 
              - fsl,imx6qp-sabresd        # i.MX6 Quad Plus SABRE Smart Device Board

          - const: fsl,imx6qp



      - description: i.MX6QP PHYTEC phyBOARD-Mira

        items:

          - const: phytec,imx6qp-pbac06-nand

          - const: phytec,imx6qp-pbac06   # PHYTEC phyBOARD-Mira

          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6qp



      - description: i.MX6DL based Boards

        items:

          - enum:
@@ -188,6 +211,7 @@ properties: 
              - toradex,colibri_imx6dl-v1_1-eval-v3 # Colibri iMX6 Module V1.1 on Colibri Evaluation Board V3

              - ysoft,imx6dl-yapp4-draco  # i.MX6 DualLite Y Soft IOTA Draco board

              - ysoft,imx6dl-yapp4-hydra  # i.MX6 DualLite Y Soft IOTA Hydra board

              - ysoft,imx6dl-yapp4-orion  # i.MX6 DualLite Y Soft IOTA Orion board

              - ysoft,imx6dl-yapp4-ursa   # i.MX6 Solo Y Soft IOTA Ursa board

          - const: fsl,imx6dl
@@ -211,10 +235,26 @@ properties: 
          - const: gw,ventana

          - const: fsl,imx6dl



      - description: i.MX6DL PHYTEC phyBOARD-Mira

        items:

          - enum:

              - phytec,imx6dl-pbac06-emmc # PHYTEC phyBOARD-Mira eMMC RDK

              - phytec,imx6dl-pbac06-nand # PHYTEC phyBOARD-Mira NAND RDK

          - const: phytec,imx6dl-pbac06   # PHYTEC phyBOARD-Mira

          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6dl



      - description: i.MX6DL PHYTEC phyFLEX-i.MX6

        items:

          - const: phytec,imx6dl-pbab01   # PHYTEC phyFLEX carrier board

          - const: phytec,imx6dl-pfla02   # PHYTEC phyFLEX-i.MX6 Quad

          - const: fsl,imx6dl



      - description: i.MX6SL based Boards

        items:

          - enum:

              - fsl,imx6sl-evk            # i.MX6 SoloLite EVK Board

              - kobo,tolino-shine2hd

              - kobo,tolino-shine3

          - const: fsl,imx6sl
@@ -246,6 +286,15 @@ properties: 
              - technexion,imx6ul-pico-pi      # TechNexion i.MX6UL Pico-Pi

          - const: fsl,imx6ul



      - description: i.MX6UL PHYTEC phyBOARD-Segin

        items:

          - enum:

              - phytec,imx6ul-pbacd10-emmc

              - phytec,imx6ul-pbacd10-nand

          - const: phytec,imx6ul-pbacd10  # PHYTEC phyBOARD-Segin with i.MX6 UL

          - const: phytec,imx6ul-pcl063   # PHYTEC phyCORE-i.MX 6UL

          - const: fsl,imx6ul



      - description: Kontron N6310 S Board

        items:

          - const: kontron,imx6ul-n6310-s
@@ -277,6 +326,15 @@ properties: 
              - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board

          - const: fsl,imx6ull



      - description: i.MX6ULL PHYTEC phyBOARD-Segin

        items:

          - enum:

              - phytec,imx6ull-pbacd10-emmc

              - phytec,imx6ull-pbacd10-nand

          - const: phytec,imx6ull-pbacd10 # PHYTEC phyBOARD-Segin with i.MX6 ULL

          - const: phytec,imx6ull-pcl063  # PHYTEC phyCORE-i.MX 6ULL

          - const: fsl,imx6ull



      - description: Kontron N6411 S Board

        items:

          - const: kontron,imx6ull-n6411-s
@@ -344,7 +402,16 @@ properties: 
      - description: i.MX8MM based Boards

        items:

          - enum:

              - beacon,imx8mm-beacon-kit  # i.MX8MM Beacon Development Kit

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

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

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

          - const: fsl,imx8mm



      - description: Variscite VAR-SOM-MX8MM based boards

        items:

          - const: variscite,var-som-mx8mm-symphony

          - const: variscite,var-som-mx8mm

          - const: fsl,imx8mm



      - description: i.MX8MN based Boards
@@ -354,6 +421,12 @@ properties: 
              - fsl,imx8mn-evk            # i.MX8MN LPDDR4 EVK Board

          - const: fsl,imx8mn



      - description: Variscite VAR-SOM-MX8MN based boards

        items:

          - const: variscite,var-som-mx8mn-symphony

          - const: variscite,var-som-mx8mn

          - const: fsl,imx8mn



      - description: i.MX8MP based Boards

        items:

          - enum:
@@ -372,13 +445,35 @@ properties: 
              - technexion,pico-pi-imx8m  # TechNexion PICO-PI-8M evk

          - const: fsl,imx8mq



      - description: Purism Librem5 phones

        items:

          - enum:

              - purism,librem5r2          # Purism Librem5 phone "Chestnut"

              - purism,librem5r3          # Purism Librem5 phone "Dogwood"

          - const: purism,librem5

          - const: fsl,imx8mq



      - description: Zodiac Inflight Innovations Ultra Boards

        items:

          - enum:

              - zii,imx8mq-ultra-rmb3

              - zii,imx8mq-ultra-zest

          - const: zii,imx8mq-ultra

          - const: fsl,imx8mq



      - description: i.MX8QXP based Boards

        items:

          - enum:

              - einfochips,imx8qxp-ai_ml  # i.MX8QXP AI_ML Board

              - fsl,imx8qxp-mek           # i.MX8QXP MEK Board

              - toradex,colibri-imx8x         # Colibri iMX8X Module

          - const: fsl,imx8qxp



      - description: Toradex Colibri i.MX8 Evaluation Board

        items:

          - enum:

              - toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3

          - const: toradex,colibri-imx8x

          - const: fsl,imx8qxp



      - description:

Documentation/devicetree/bindings/nvmem/vf610-ocotp.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ On-Chip OTP Memory for Freescale Vybrid 


Required Properties:

  compatible:

  - "fsl,vf610-ocotp" for VF5xx/VF6xx

  - "fsl,vf610-ocotp", "syscon" for VF5xx/VF6xx

  #address-cells : Should be 1

  #size-cells : Should be 1

  reg : Address and length of OTP controller and fuse map registers
@@ -11,7 +11,7 @@ Required Properties: 
Example for Vybrid VF5xx/VF6xx:



	ocotp: ocotp@400a5000 {

		compatible = "fsl,vf610-ocotp";

		compatible = "fsl,vf610-ocotp", "syscon";

		#address-cells = <1>;

		#size-cells = <1>;

		reg = <0x400a5000 0xCF0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE