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

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

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

i.MX dt-bindings for 6.5:

- Add vendor prefix for Emtop
- Compatibles for Marantec Maveo Box, i.MX8MM-EVKB and GW7905-2x board.
- Replace tab indent with spaces in fsl.yaml.

* tag 'imx-bindings-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: arm: Add Gateworks i.MX8M GW7905-2x board
  dt-bindings: arm: fsl: Fix syntax error
  dt-bindings: vendor-prefixes: Add Emtop
  dt-bindings: arm: fsl: Add Emtop SoM & Baseboard
  dt-bindings: arm: fsl: Add i.MX8MM-EVKB
  dt-bindings: arm: fsl: Add Marantec maveo box as a DHCOR i.MX6ULL SoM based board

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 52d38cff 50b1e9ec
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -726,6 +726,12 @@ properties:
          - const: dh,imx6ull-dhcor-som
          - const: fsl,imx6ull

      - description: i.MX6ULL DHCOR SoM based Boards
        items:
          - const: marantec,imx6ull-dhcor-maveo-box
          - const: dh,imx6ull-dhcor-som
          - const: fsl,imx6ull

      - description: i.MX6ULL PHYTEC phyBOARD-Segin
        items:
          - enum:
@@ -901,6 +907,7 @@ properties:
              - emtrion,emcon-mx8mm-avari # emCON-MX8MM SoM on Avari Base
              - fsl,imx8mm-ddr4-evk       # i.MX8MM DDR4 EVK Board
              - fsl,imx8mm-evk            # i.MX8MM EVK Board
              - fsl,imx8mm-evkb           # i.MX8MM EVKB Board
              - gateworks,imx8mm-gw7904
              - gw,imx8mm-gw71xx-0x       # i.MX8MM Gateworks Development Kit
              - gw,imx8mm-gw72xx-0x       # i.MX8MM Gateworks Development Kit
@@ -918,6 +925,12 @@ properties:
              - prt,prt8mm                # i.MX8MM Protonic PRT8MM Board
          - const: fsl,imx8mm

      - description: Emtop i.MX8MM based Boards
        items:
          - const: ees,imx8mm-emtop-baseboard      # i.MX8MM Emtop SoM on i.MX8M Mini Baseboard V1
          - const: ees,imx8mm-emtop-som            # i.MX8MM Emtop SOM-IMX8MMLPD4 module
          - const: fsl,imx8mm

      - description: Engicam i.Core MX8M Mini SoM based boards
        items:
          - enum:
@@ -1019,6 +1032,7 @@ properties:
              - dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
              - fsl,imx8mp-evk            # i.MX8MP EVK Board
              - gateworks,imx8mp-gw74xx   # i.MX8MP Gateworks Board
              - gateworks,imx8mp-gw7905-2x # i.MX8MP Gateworks Board
              - polyhex,imx8mp-debix      # Polyhex Debix boards
              - polyhex,imx8mp-debix-model-a # Polyhex Debix Model A Board
              - toradex,verdin-imx8mp     # Verdin iMX8M Plus Modules
+2 −0
Original line number Diff line number Diff line
@@ -388,6 +388,8 @@ patternProperties:
    description: EDIMAX Technology Co., Ltd
  "^edt,.*":
    description: Emerging Display Technologies
  "^ees,.*":
    description: Emtop Embedded Solutions
  "^eeti,.*":
    description: eGalax_eMPIA Technology Inc
  "^einfochips,.*":