diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-15 08:10:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-15 08:10:13 -0700 |
| commit | bb1a7fcec17eea1d60678f1540aa2226eef9d70a (patch) | |
| tree | 6d1b65e5661cf09d383aebb41bdded1fd590d5f9 /Documentation/devicetree/bindings/arm | |
| parent | 406b968552c6bad8d8c8488e910459652732cc07 (diff) | |
| parent | cd044eafd7105275220f6b7140a8a8fb64e0e5af (diff) | |
Merge tag 'imx-bindings-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt
i.MX dt-bindings update for 5.14:
- Add vendor prefixes for congatec GmbH and DaSheng, Inc.
- Add compatibles for i.MX6Q DaSheng COM-9XX SBC, GE B1x5pv2 and
i.MX8MM GW7901 boards.
- Add an optional 'resets' property for i.MX GPCv2 bindings.
* tag 'imx-bindings-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
dt-bindings: arm: fsl: add GE B1x5pv2 boards
dt-bindings: vendor-prefixes: add congatec
dt-bindings: imx: gpcv2: add support for optional resets
dt-bindings: arm: imx: Add i.mx6q DaSheng COM-9XX SBC
dt-bindings: add dasheng vendor prefix
dt-bindings: arm: imx: add imx8mm gw7901 support
Link: https://lore.kernel.org/r/20210613082544.16067-3-shawnguo@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/fsl.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml index e3c50f231d71..1c827c1954dc 100644 --- a/Documentation/devicetree/bindings/arm/fsl.yaml +++ b/Documentation/devicetree/bindings/arm/fsl.yaml @@ -197,6 +197,7 @@ properties: - boundary,imx6q-nitrogen6x - compulab,cm-fx6 # CompuLab CM-FX6 - dmo,imx6q-edmqmx6 # Data Modul eDM-QMX6 Board + - ds,imx6q-sbc # Da Sheng COM-9XX Modules - embest,imx6q-marsboard # Embest MarS Board i.MX6Dual - emtrion,emcon-mx6 # emCON-MX6D or emCON-MX6Q SoM - emtrion,emcon-mx6-avari # emCON-MX6D or emCON-MX6Q SoM on Avari Base @@ -400,6 +401,17 @@ properties: - const: armadeus,imx6dl-apf6 # APF6 (Solo) SoM - const: fsl,imx6dl + - description: i.MX6DL based congatec QMX6 Boards + items: + - enum: + - ge,imx6dl-b105v2 # General Electric B105v2 + - ge,imx6dl-b105pv2 # General Electric B105Pv2 + - ge,imx6dl-b125v2 # General Electric B125v2 + - ge,imx6dl-b125pv2 # General Electric B125Pv2 + - ge,imx6dl-b155v2 # General Electric B155v2 + - const: congatec,qmx6 + - const: fsl,imx6dl + - description: i.MX6DL based DFI FS700-M60-6DL Board items: - const: dfi,fs700-m60-6dl @@ -685,6 +697,7 @@ properties: - gw,imx8mm-gw71xx-0x # i.MX8MM Gateworks Development Kit - gw,imx8mm-gw72xx-0x # i.MX8MM Gateworks Development Kit - gw,imx8mm-gw73xx-0x # i.MX8MM Gateworks Development Kit + - gw,imx8mm-gw7901 # i.MX8MM Gateworks Board - kontron,imx8mm-n801x-som # i.MX8MM Kontron SL (N801X) SOM - variscite,var-som-mx8mm # i.MX8MM Variscite VAR-SOM-MX8MM module - const: fsl,imx8mm |