Commit 86724b74 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX dt-bindings update for 6.4:

- Add vendor prefix for chargebyte.
- A bunch of new board compatibles: Tolino Vision, Toradex Apalis,
  chargebyte Tarragon, i.MX8M Plus based boards from DH electronics
  and Data Modul, etc.
- A series from Marek Vasut to improve blk-ctrl bindings.

* tag 'imx-bindings-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: arm: Add Data Modul i.MX8M Plus eDM SBC
  dt-bindings: arm: fsl: Add chargebyte Tarragon
  dt-bindings: vendor-prefixes: add chargebyte
  dt-bindings: soc: imx-blk-ctrl: Drop leading label in blk-ctrl in examples
  dt-bindings: soc: imx8m-blk-ctrl: Rename blk_ctrl to blk-ctrl in examples
  dt-bindings: arm: Add DH electronics i.MX8M Plus DHCOM on PDK3
  dt-bindings: arm: fsl: add compatible string for Tolino Vision
  dt-bindings: arm: fsl: Add Y Soft IOTA Phoenix, Lynx, Pegasus and Pegasus+
  dt-bindings: arm: fsl: Add colibri-imx8x carrier boards
  dt-bindings: soc: imx8mp-media-blk-ctrl: Add LDB subnode into schema and example
  dt-bindings: soc: imx8mp-media-blk-ctrl: Align block controller example name
  dt-bindings: arm: fsl: Fix copy-paste error in comment
  dt-bindings: arm: fsl: add toradex,apalis-imx8 et al.
parents 83f91bb4 e7a985d5

Documentation/devicetree/bindings/arm/fsl.yaml

+42 −3
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ properties: 
              - variscite,dt6customboard

              - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board

              - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board

              - ysoft,imx6q-yapp4-pegasus # i.MX6 Quad Y Soft IOTA Pegasus board

              - zealz,imx6q-gk802         # Zealz GK802

              - zii,imx6q-zii-rdu2        # ZII RDU2 Board

          - const: fsl,imx6q
@@ -410,6 +411,7 @@ properties: 
              - prt,prtwd3                # Protonic WD3 board

              - wand,imx6qp-wandboard     # Wandboard i.MX6 QuadPlus Board

              - ysoft,imx6qp-yapp4-crux-plus  # i.MX6 Quad Plus Y Soft IOTA Crux+ board

              - ysoft,imx6qp-yapp4-pegasus-plus # i.MX6 Quad Plus Y Soft IOTA Pegasus+ board

              - zii,imx6qp-zii-rdu2       # ZII RDU2+ Board

          - const: fsl,imx6qp
@@ -474,9 +476,11 @@ properties: 
              - udoo,imx6dl-udoo          # Udoo i.MX6 Dual-lite Board

              - vdl,lanmcu                # Van der Laan LANMCU board

              - wand,imx6dl-wandboard     # Wandboard i.MX6 Dual Lite Board

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

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

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

              - ysoft,imx6dl-yapp4-lynx   # i.MX6 DualLite Y Soft IOTA Lynx board

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

              - ysoft,imx6dl-yapp4-phoenix  # i.MX6 DualLite Y Soft IOTA Phoenix board

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

          - const: fsl,imx6dl
@@ -581,6 +585,7 @@ properties: 
              - kobo,aura2

              - kobo,tolino-shine2hd

              - kobo,tolino-shine3

              - kobo,tolino-vision

              - kobo,tolino-vision5

              - revotics,imx6sl-warp      # Revotics WaRP Board

          - const: fsl,imx6sl
@@ -702,6 +707,15 @@ properties: 
          - const: armadeus,imx6ull-opos6ul     # OPOS6UL (i.MX6ULL) SoM

          - const: fsl,imx6ull



      - description: i.MX6ULL chargebyte Tarragon Boards

        items:

          - enum:

              - chargebyte,imx6ull-tarragon-master

              - chargebyte,imx6ull-tarragon-micro

              - chargebyte,imx6ull-tarragon-slave

              - chargebyte,imx6ull-tarragon-slavext

          - const: fsl,imx6ull



      - description: i.MX6ULL DHCOM SoM based Boards

        items:

          - enum:
@@ -1002,6 +1016,7 @@ properties: 
        items:

          - enum:

              - beacon,imx8mp-beacon-kit  # i.MX8MP Beacon Development Kit

              - dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC

              - fsl,imx8mp-evk            # i.MX8MP EVK Board

              - gateworks,imx8mp-gw74xx   # i.MX8MP Gateworks Board

              - polyhex,imx8mp-debix      # Polyhex Debix boards
@@ -1020,7 +1035,9 @@ properties: 


      - description: i.MX8MP DHCOM based Boards

        items:

          - const: dh,imx8mp-dhcom-pdk2      # i.MX8MP DHCOM SoM on PDK2 board

          - enum:

              - dh,imx8mp-dhcom-pdk2         # i.MX8MP DHCOM SoM on PDK2 board

              - dh,imx8mp-dhcom-pdk3         # i.MX8MP DHCOM SoM on PDK3 board

          - const: dh,imx8mp-dhcom-som       # i.MX8MP DHCOM SoM

          - const: fsl,imx8mp
@@ -1119,6 +1136,25 @@ properties: 
        items:

          - enum:

              - fsl,imx8qm-mek           # i.MX8QM MEK Board

              - toradex,apalis-imx8      # Apalis iMX8 Modules

              - toradex,apalis-imx8-v1.1 # Apalis iMX8 V1.1 Modules

          - const: fsl,imx8qm



      - description: i.MX8QM Boards with Toradex Apalis iMX8 Modules

        items:

          - enum:

              - toradex,apalis-imx8-eval            # Apalis iMX8 Module on Apalis Evaluation Board

              - toradex,apalis-imx8-ixora-v1.1      # Apalis iMX8 Module on Ixora V1.1 Carrier Board

          - const: toradex,apalis-imx8

          - const: fsl,imx8qm



      - description: i.MX8QM Boards with Toradex Apalis iMX8 V1.1 Modules

        items:

          - enum:

              - toradex,apalis-imx8-v1.1-eval       # Apalis iMX8 V1.1 Module on Apalis Eval. Board

              - toradex,apalis-imx8-v1.1-ixora-v1.1 # Apalis iMX8 V1.1 Module on Ixora V1.1 C. Board

              - toradex,apalis-imx8-v1.1-ixora-v1.2 # Apalis iMX8 V1.1 Module on Ixora V1.2 C. Board

          - const: toradex,apalis-imx8-v1.1

          - const: fsl,imx8qm



      - description: i.MX8QXP based Boards
@@ -1135,10 +1171,13 @@ properties: 
              - fsl,imx8dxl-evk           # i.MX8DXL EVK Board

          - const: fsl,imx8dxl



      - description: i.MX8QXP Boards with Toradex Coilbri iMX8X Modules

      - description: i.MX8QXP Boards with Toradex Colibri iMX8X Modules

        items:

          - enum:

              - toradex,colibri-imx8x-aster   # Colibri iMX8X Module on Aster Board

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

              - toradex,colibri-imx8x-iris    # Colibri iMX8X Module on Iris Board

              - toradex,colibri-imx8x-iris-v2 # Colibri iMX8X Module on Iris Board V2

          - const: toradex,colibri-imx8x

          - const: fsl,imx8qxp

Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ examples: 
    #include <dt-bindings/clock/imx8mm-clock.h>

    #include <dt-bindings/power/imx8mm-power.h>



    disp_blk_ctl: blk_ctrl@32e28000 {

    blk-ctrl@32e28000 {

      compatible = "fsl,imx8mm-disp-blk-ctrl", "syscon";

      reg = <0x32e28000 0x100>;

      power-domains = <&pgc_dispmix>, <&pgc_dispmix>, <&pgc_dispmix>,

Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ examples: 
    #include <dt-bindings/clock/imx8mm-clock.h>

    #include <dt-bindings/power/imx8mm-power.h>



    vpu_blk_ctrl: blk-ctrl@38330000 {

    blk-ctrl@38330000 {

      compatible = "fsl,imx8mm-vpu-blk-ctrl", "syscon";

      reg = <0x38330000 0x100>;

      power-domains = <&pgc_vpumix>, <&pgc_vpu_g1>,

Documentation/devicetree/bindings/soc/imx/fsl,imx8mn-disp-blk-ctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ examples: 
    #include <dt-bindings/clock/imx8mn-clock.h>

    #include <dt-bindings/power/imx8mn-power.h>



    disp_blk_ctl: blk_ctrl@32e28000 {

    blk-ctrl@32e28000 {

      compatible = "fsl,imx8mn-disp-blk-ctrl", "syscon";

      reg = <0x32e28000 0x100>;

      power-domains = <&pgc_dispmix>, <&pgc_dispmix>,

Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ examples: 
    #include <dt-bindings/clock/imx8mp-clock.h>

    #include <dt-bindings/power/imx8mp-power.h>



    hsio_blk_ctrl: blk-ctrl@32f10000 {

    blk-ctrl@32f10000 {

        compatible = "fsl,imx8mp-hsio-blk-ctrl", "syscon";

        reg = <0x32f10000 0x24>;

        clocks = <&clk IMX8MP_CLK_USB_ROOT>,