Skip to content

Commit 33dc817

Browse files
committed
Merge tag 'imx-bindings-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX dt-bindgings changes for 6.20: - New board compatibles for i.MX93 11x11 FRDM, Apalis iMX8QP, i.MX91 FRDM, ifm VHIP4 EvalBoard v1 and v2, TQ-Systems MBLS1028A/MBLS1028A-IND, i.MX952 EVK, i.MX8MP FRDM - Add vendor prefix for ifm electronic gmbh - A couple of small changes for fsl,imx-gpc.yaml and tcg,tpm-tis-i2c.yaml * tag 'imx-bindings-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: arm: fsl: Add compatible for i.MX95 15x15 FRDM board dt-bindings: arm: fsl: Document ifm VHIP4 EvalBoard v1 and v2 dt-bindings: vendor-prefixes: Document ifm electronic gmbh dt-bindings: arm: fsl: Add FRDM-IMX91 board dt-bindings: tpm: Add st,st33tphf2ei2c dt-bindings: arm: fsl: Add Apalis iMX8QP dt-bindings: arm: fsl: add i.MX952 EVK board dt-bindings: arm: fsl: add i.MX93 11x11 FRDM board dt-bindings: power: fsl,imx-gpc: Document address-cells dt-bindings: arm: fsl: Add i.MX8MP FRDM board dt-bindings: arm: fsl: add TQ-Systems boards MBLS1028A and MBLS1028A-IND Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 1daa947 + b171714 commit 33dc817

4 files changed

Lines changed: 38 additions & 2 deletions

File tree

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,6 +1071,15 @@ properties:
10711071
- gw,imx8mn-gw7902 # i.MX8MM Gateworks Board
10721072
- const: fsl,imx8mn
10731073

1074+
- description: ifm i.MX8MN VHIP4 based boards
1075+
items:
1076+
- enum:
1077+
- ifm,imx8mn-vhip4-evalboard-v1
1078+
- ifm,imx8mn-vhip4-evalboard-v2
1079+
- const: ifm,imx8mn-vhip4-evalboard
1080+
- const: ifm,imx8mn-vhip4
1081+
- const: fsl,imx8mn
1082+
10741083
- description: Variscite VAR-SOM-MX8MN based boards
10751084
items:
10761085
- enum:
@@ -1099,6 +1108,7 @@ properties:
10991108
- emcraft,imx8mp-navqp # i.MX8MP Emcraft Systems NavQ+ Kit
11001109
- fsl,imx8mp-evk # i.MX8MP EVK Board
11011110
- fsl,imx8mp-evk-revb4 # i.MX8MP EVK Rev B4 Board
1111+
- fsl,imx8mp-frdm # i.MX8MP Freedom Board
11021112
- gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board
11031113
- gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board
11041114
- gateworks,imx8mp-gw73xx-2x # i.MX8MP Gateworks Board
@@ -1333,15 +1343,17 @@ properties:
13331343
- const: toradex,apalis-imx8
13341344
- const: fsl,imx8qm
13351345

1336-
- description: i.MX8QM Boards with Toradex Apalis iMX8 V1.1 Modules
1346+
- description: i.MX8QM/i.MX8QP Boards with Toradex Apalis iMX8 V1.1 Modules
13371347
items:
13381348
- enum:
13391349
- toradex,apalis-imx8-v1.1-eval # Apalis iMX8 V1.1 Module on Apalis Eval. V1.0/V1.1 Board
13401350
- toradex,apalis-imx8-v1.1-eval-v1.2 # Apalis iMX8 V1.1 Module on Apalis Eval. V1.2 Board
13411351
- toradex,apalis-imx8-v1.1-ixora-v1.1 # Apalis iMX8 V1.1 Module on Ixora V1.1 C. Board
13421352
- toradex,apalis-imx8-v1.1-ixora-v1.2 # Apalis iMX8 V1.1 Module on Ixora V1.2 C. Board
13431353
- const: toradex,apalis-imx8-v1.1
1344-
- const: fsl,imx8qm
1354+
- enum:
1355+
- fsl,imx8qm
1356+
- fsl,imx8qp
13451357

13461358
- description: i.MX8QXP based Boards
13471359
items:
@@ -1412,13 +1424,15 @@ properties:
14121424
items:
14131425
- enum:
14141426
- fsl,imx91-11x11-evk # i.MX91 11x11 EVK Board
1427+
- fsl,imx91-11x11-frdm # FRDM i.MX91 Development Board
14151428
- const: fsl,imx91
14161429

14171430
- description: i.MX93 based Boards
14181431
items:
14191432
- enum:
14201433
- fsl,imx93-9x9-qsb # i.MX93 9x9 QSB Board
14211434
- fsl,imx93-11x11-evk # i.MX93 11x11 EVK Board
1435+
- fsl,imx93-11x11-frdm # i.MX93 11x11 FRDM Board
14221436
- fsl,imx93-14x14-evk # i.MX93 14x14 EVK Board
14231437
- const: fsl,imx93
14241438

@@ -1432,10 +1446,17 @@ properties:
14321446
items:
14331447
- enum:
14341448
- fsl,imx95-15x15-evk # i.MX95 15x15 EVK Board
1449+
- fsl,imx95-15x15-frdm # i.MX95 15x15 FRDM Board
14351450
- fsl,imx95-19x19-evk # i.MX95 19x19 EVK Board
14361451
- toradex,verdin-imx95-19x19-evk # i.MX95 Verdin Evaluation Kit (EVK)
14371452
- const: fsl,imx95
14381453

1454+
- description: i.MX952 based Boards
1455+
items:
1456+
- enum:
1457+
- fsl,imx952-evk # i.MX952 EVK Board
1458+
- const: fsl,imx952
1459+
14391460
- description: PHYTEC i.MX 95 FPSC based Boards
14401461
items:
14411462
- enum:
@@ -1672,6 +1693,15 @@ properties:
16721693
- const: kontron,sl28
16731694
- const: fsl,ls1028a
16741695

1696+
- description:
1697+
TQ-Systems TQMLS1028A SoM on MBLS1028A/MBLS1028A-IND board
1698+
items:
1699+
- enum:
1700+
- tq,ls1028a-tqmls1028a-mbls1028a
1701+
- tq,ls1028a-tqmls1028a-mbls1028a-ind
1702+
- const: tq,ls1028a-tqmls1028a
1703+
- const: fsl,ls1028a
1704+
16751705
- description: LS1043A based Boards
16761706
items:
16771707
- enum:

Documentation/devicetree/bindings/power/fsl,imx-gpc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ properties:
3838
reg:
3939
maxItems: 1
4040

41+
"#address-cells":
42+
const: 0
43+
4144
interrupts:
4245
maxItems: 1
4346

Documentation/devicetree/bindings/tpm/tcg,tpm-tis-i2c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ properties:
3333
- infineon,slb9673
3434
- nuvoton,npct75x
3535
- st,st33ktpm2xi2c
36+
- st,st33tphf2ei2c
3637
- const: tcg,tpm-tis-i2c
3738

3839
- description: TPM 1.2 and 2.0 chips with vendor-specific I²C interface

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,8 @@ patternProperties:
757757
description: IEI Integration Corp.
758758
"^ifi,.*":
759759
description: Ingenieurburo Fur Ic-Technologie (I/F/I)
760+
"^ifm,.*":
761+
description: ifm electronic gmbh
760762
"^ilitek,.*":
761763
description: ILI Technology Corporation (ILITEK)
762764
"^imagis,.*":

0 commit comments

Comments
 (0)