Skip to content

Commit 07fd5cc

Browse files
committed
Merge tag 'imx-bindings-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX DT bindings for 6.11: - Add compatible string for various new boards - Drop Li Yang as maintainer for bindings as his email bounces * tag 'imx-bindings-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: dt-bindings: arm: fsl: document Kontron SMARC-sAMX6i boards dt-bindings: arm: add MBa8MP-RAS314 SBC dt-bindings: arm: fsl: add i.MX93 9x9 QSB board dt-bindings: arm: fsl: add i.MX95 19x19 EVK board dt-bindings: arm: fsl: Document Compulab IOT-GATE-iMX8 dt-bindings: Drop Li Yang as maintainer for all bindings Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7120733 + 189375a commit 07fd5cc

File tree

4 files changed

+29
-6
lines changed

4 files changed

+29
-6
lines changed

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ title: Freescale i.MX Platforms
88

99
maintainers:
1010
- Shawn Guo <[email protected]>
11-
- Li Yang <[email protected]>
1211

1312
properties:
1413
$nodename:
@@ -363,6 +362,12 @@ properties:
363362
- const: gw,ventana
364363
- const: fsl,imx6q
365364

365+
- description: i.MX6Q Kontron SMARC-sAMX6i on SMARC Eval Carrier 2.0
366+
items:
367+
- const: kontron,imx6q-samx6i-ads2
368+
- const: kontron,imx6q-samx6i
369+
- const: fsl,imx6q
370+
366371
- description: i.MX6Q PHYTEC phyBOARD-Mira
367372
items:
368373
- enum:
@@ -544,6 +549,12 @@ properties:
544549
- const: gw,ventana
545550
- const: fsl,imx6dl
546551

552+
- description: i.MX6DL Kontron SMARC-sAMX6i on SMARC Eval Carrier 2.0
553+
items:
554+
- const: kontron,imx6dl-samx6i-ads2
555+
- const: kontron,imx6dl-samx6i
556+
- const: fsl,imx6dl
557+
547558
- description: i.MX6DL PHYTEC phyBOARD-Mira
548559
items:
549560
- enum:
@@ -946,6 +957,13 @@ properties:
946957
- prt,prt8mm # i.MX8MM Protonic PRT8MM Board
947958
- const: fsl,imx8mm
948959

960+
- description: Compulab i.MX8MM UCM SoM based boards
961+
items:
962+
- enum:
963+
- compulab,imx8mm-iot-gateway # i.MX8MM Compulab IoT-Gateway
964+
- const: compulab,imx8mm-ucm-som # i.MX8MM Compulab UCM SoM
965+
- const: fsl,imx8mm
966+
949967
- description: Emtop i.MX8MM based Boards
950968
items:
951969
- const: ees,imx8mm-emtop-baseboard # i.MX8MM Emtop SoM on i.MX8M Mini Baseboard V1
@@ -1145,8 +1163,9 @@ properties:
11451163
version as an industrial computing device.
11461164
items:
11471165
- enum:
1148-
- tq,imx8mp-tqma8mpql-mba8mpxl # TQ-Systems GmbH i.MX8MP TQMa8MPQL SOM on MBa8MPxL
1149-
- const: tq,imx8mp-tqma8mpql # TQ-Systems GmbH i.MX8MP TQMa8MPQL SOM
1166+
- tq,imx8mp-tqma8mpql-mba8mpxl # TQ-Systems GmbH i.MX8MP TQMa8MPQL SOM on MBa8MPxL
1167+
- tq,imx8mp-tqma8mpql-mba8mp-ras314 # TQ-Systems GmbH i.MX8MP TQMa8MPQL SOM on MBa8MP-RAS314
1168+
- const: tq,imx8mp-tqma8mpql # TQ-Systems GmbH i.MX8MP TQMa8MPQL SOM
11501169
- const: fsl,imx8mp
11511170

11521171
- description: i.MX8MQ based Boards
@@ -1272,9 +1291,16 @@ properties:
12721291
- description: i.MX93 based Boards
12731292
items:
12741293
- enum:
1294+
- fsl,imx93-9x9-qsb # i.MX93 9x9 QSB Board
12751295
- fsl,imx93-11x11-evk # i.MX93 11x11 EVK Board
12761296
- const: fsl,imx93
12771297

1298+
- description: i.MX95 based Boards
1299+
items:
1300+
- enum:
1301+
- fsl,imx95-19x19-evk # i.MX95 19x19 EVK Board
1302+
- const: fsl,imx95
1303+
12781304
- description: i.MXRT1050 based Boards
12791305
items:
12801306
- enum:

Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ title: Freescale Layerscape External Interrupt Controller
88

99
maintainers:
1010
- Shawn Guo <[email protected]>
11-
- Li Yang <[email protected]>
1211

1312
description: |
1413
Some Layerscape SOCs (LS1021A, LS1043A, LS1046A LS1088A, LS208xA,

Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ title: Freescale Layerscape Device Configuration Unit
88

99
maintainers:
1010
- Shawn Guo <[email protected]>
11-
- Li Yang <[email protected]>
1211

1312
description: |
1413
DCFG is the device configuration unit, that provides general purpose

Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-scfg.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ title: Freescale Layerscape Supplemental Configuration Unit
88

99
maintainers:
1010
- Shawn Guo <[email protected]>
11-
- Li Yang <[email protected]>
1211

1312
description: |
1413
SCFG is the supplemental configuration unit, that provides SoC specific

0 commit comments

Comments
 (0)