Skip to content

Commit 3fdb967

Browse files
committed
Merge tag 'imx-bindings-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX DT bindings for 6.10: - Add vendor prefix for Emcraft Systems - Add compatible for new boards: Emcraft Systems i.MX8M Plus NavQ+ Kit, Colibri iMX8DX, Seeed studio NPi base board, NXP S32G3 board - Drop reduntant toradex,colibri-imx8x from fsl.yaml - Add usbmisc compatible for i.MX8ULP * tag 'imx-bindings-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: usb: usbmisc-imx: add fsl,imx8ulp-usbmisc compatible dt-bindings: arm: fsl: Add Colibri iMX8DX dt-bindings: arm: fsl: remove reduntant toradex,colibri-imx8x dt-bindings: arm: Add Emcraft Systems i.MX8M Plus NavQ+ Kit dt-bindings: vendor-prefixes: Add Emcraft Systems dt-bindings: arm: fsl: add NXP S32G3 board dt-bindings: arm: fsl: Add Seeed studio NPi based boards Link: https://lore.kernel.org/r/20240428121247.10370-2-shawnguo2@yeah.net Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 1d3454f + 6687155 commit 3fdb967

3 files changed

Lines changed: 22 additions & 3 deletions

File tree

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,14 @@ properties:
813813
- const: tq,imx6ull-tqma6ull2l # MCIMX6Y2, LGA SoM variant
814814
- const: fsl,imx6ull
815815

816+
- description: Seeed Stuido i.MX6ULL SoM on dev boards
817+
items:
818+
- enum:
819+
- seeed,imx6ull-seeed-npi-emmc
820+
- seeed,imx6ull-seeed-npi-nand
821+
- const: seeed,imx6ull-seeed-npi
822+
- const: fsl,imx6ull
823+
816824
- description: i.MX6ULZ based Boards
817825
items:
818826
- enum:
@@ -1050,6 +1058,7 @@ properties:
10501058
- enum:
10511059
- beacon,imx8mp-beacon-kit # i.MX8MP Beacon Development Kit
10521060
- dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
1061+
- emcraft,imx8mp-navqp # i.MX8MP Emcraft Systems NavQ+ Kit
10531062
- fsl,imx8mp-evk # i.MX8MP EVK Board
10541063
- gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board
10551064
- gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board
@@ -1218,7 +1227,6 @@ properties:
12181227
- enum:
12191228
- einfochips,imx8qxp-ai_ml # i.MX8QXP AI_ML Board
12201229
- fsl,imx8qxp-mek # i.MX8QXP MEK Board
1221-
- toradex,colibri-imx8x # Colibri iMX8X Modules
12221230
- const: fsl,imx8qxp
12231231

12241232
- description: i.MX8DXL based Boards
@@ -1227,15 +1235,17 @@ properties:
12271235
- fsl,imx8dxl-evk # i.MX8DXL EVK Board
12281236
- const: fsl,imx8dxl
12291237

1230-
- description: i.MX8QXP Boards with Toradex Colibri iMX8X Modules
1238+
- description: i.MX8QXP/i.MX8DX Boards with Toradex Colibri iMX8X Modules
12311239
items:
12321240
- enum:
12331241
- toradex,colibri-imx8x-aster # Colibri iMX8X Module on Aster Board
12341242
- toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
12351243
- toradex,colibri-imx8x-iris # Colibri iMX8X Module on Iris Board
12361244
- toradex,colibri-imx8x-iris-v2 # Colibri iMX8X Module on Iris Board V2
12371245
- const: toradex,colibri-imx8x
1238-
- const: fsl,imx8qxp
1246+
- enum:
1247+
- fsl,imx8qxp
1248+
- fsl,imx8dx
12391249

12401250
- description:
12411251
TQMa8Xx is a series of SOM featuring NXP i.MX8X system-on-chip
@@ -1536,6 +1546,12 @@ properties:
15361546
- nxp,s32g274a-rdb2
15371547
- const: nxp,s32g2
15381548

1549+
- description: S32G3 based Boards
1550+
items:
1551+
- enum:
1552+
- nxp,s32g399a-rdb3
1553+
- const: nxp,s32g3
1554+
15391555
- description: S32V234 based Boards
15401556
items:
15411557
- enum:

Documentation/devicetree/bindings/usb/fsl,usbmisc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ properties:
3333
- fsl,imx7ulp-usbmisc
3434
- fsl,imx8mm-usbmisc
3535
- fsl,imx8mn-usbmisc
36+
- fsl,imx8ulp-usbmisc
3637
- const: fsl,imx7d-usbmisc
3738
- const: fsl,imx6q-usbmisc
3839
- items:

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,8 @@ patternProperties:
440440
description: Dongguan EmbedFire Electronic Technology Co., Ltd.
441441
"^embest,.*":
442442
description: Shenzhen Embest Technology Co., Ltd.
443+
"^emcraft,.*":
444+
description: Emcraft Systems
443445
"^emlid,.*":
444446
description: Emlid, Ltd.
445447
"^emmicro,.*":

0 commit comments

Comments
 (0)