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

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

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

i.MX DT bindings for 6.3:

- New board compatibles: Beacon EmbeddedWorks i.MX8M Plus kit,
  DHCOM PDK2, PicoITX and DRC02, Enumerate Debix, Starterkit SK-iMX53,
  verdin yavia carrier-board.
- Add vendor prefix for Polyhex Technology Co.
- A series from Krzysztof Kozlowski to fix up fsl,imx-gpc bindings.
- Add clock cells for imx8mp-hsio-blk-ctrl bindings.
- A series from Marek Vasut to shuffle i.MX8MM board entries.
- A couple changes from Stefan Wahren to update compatibles for i.MX28
  based boards.

* tag 'imx-bindings-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: arm: fsl: Add verdin yavia carrier-board
  dt-bindings: arm: fsl: Add PDK2, PicoITX and DRC02 boards for the DHCOM i.MX6ULL SoM
  dt-bindings: arm: Document the rest of i.MX28 based boards
  dt-bindings: arm: fsl: Fix bindings for APF28Dev board
  dt-bindings: power: fsl,imx-gpc: document interrupt-controller
  dt-bindings: power: fsl,imx-gpc: correct compatibles
  dt-bindings: power: fsl,imx-gpc: document fsl,imx6ul-gpc compatible
  dt-bindings: arm: Add Beacon EmbeddedWorks i.MX8M Plus kit
  dt-bindings: arm: Move i.MX8MM Cloos PHG Board to TQM entry
  dt-bindings: arm: Split i.MX8M Plus DHCOM based boards
  dt-bindings: arm: Split i.MX8M Mini NITROGEN SoM based boards
  dt-bindings: arm: Move MX8Menlo board to i.MX8M Mini Toradex Verdin SoM entry
  dt-bindings: soc: imx: add IOMUXC GPR support
  dt-bindings: arm: fsl: Add the Starterkit SK-iMX53 board
  dt-bindings: vendor-prefixes: add Startkit
  dt-bindings: soc: imx8mp-hsio-blk-ctrl: add clock cells
  dt-bindings: arm: fsl: Enumerate Debix Model A Board
  dt-bindings: vendor-prefixes: Add Polyhex Technology Co.

Link: https://lore.kernel.org/r/20230130023947.11780-3-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f0f4c73a 551460d1

Documentation/devicetree/bindings/arm/fsl.yaml

+90 −6
Original line number Diff line number Diff line
@@ -88,12 +88,56 @@ properties: 
        items:

          - enum:

              - armadeus,imx28-apf28      # APF28 SoM

              - armadeus,imx28-apf28dev   # APF28 SoM on APF28Dev board

              - bluegiga,apx4devkit       # Bluegiga APx4 SoM on dev board

              - crystalfontz,cfa10036     # Crystalfontz CFA-10036 SoM

              - eukrea,mbmx28lc

              - fsl,imx28-evk

              - i2se,duckbill

              - i2se,duckbill-2

              - karo,tx28                 # Ka-Ro electronics TX28 module

              - lwn,imx28-xea

              - msr,m28cu3                # M28 SoM with custom base board

              - schulercontrol,imx28-sps1

              - technologic,imx28-ts4600

          - const: fsl,imx28



      - description: i.MX28 Aries M28 SoM Board

        items:

          - const: aries,m28

          - const: denx,m28

          - const: fsl,imx28



      - description: i.MX28 Aries M28EVK Board

        items:

          - const: aries,m28evk

          - const: denx,m28evk

          - const: fsl,imx28



      - description: i.MX28 Armadeus Systems APF28Dev Board

        items:

          - const: armadeus,imx28-apf28dev

          - const: armadeus,imx28-apf28

          - const: fsl,imx28



      - description: i.MX28 Crystalfontz CFA-10036 based Boards

        items:

          - enum:

              - crystalfontz,cfa10037

              - crystalfontz,cfa10049

              - crystalfontz,cfa10057

              - crystalfontz,cfa10058

          - const: crystalfontz,cfa10036

          - const: fsl,imx28



      - description: i.MX28 Crystalfontz CFA-10037 based Boards

        items:

          - enum:

              - crystalfontz,cfa10055

              - crystalfontz,cfa10056

          - const: crystalfontz,cfa10037

          - const: crystalfontz,cfa10036

          - const: fsl,imx28



      - description: i.MX28 Duckbill 2 based Boards

        items:

          - enum:
@@ -103,6 +147,19 @@ properties: 
          - const: i2se,duckbill-2

          - const: fsl,imx28



      - description: i.MX28 Eukrea Electromatique MBMX283LC Board

        items:

          - const: eukrea,mbmx283lc

          - const: eukrea,mbmx28lc

          - const: fsl,imx28



      - description: i.MX28 Eukrea Electromatique MBMX287LC Board

        items:

          - const: eukrea,mbmx287lc

          - const: eukrea,mbmx283lc

          - const: eukrea,mbmx28lc

          - const: fsl,imx28



      - description: i.MX31 based Boards

        items:

          - enum:
@@ -173,6 +230,7 @@ properties: 
              - kiebackpeter,imx53-ddc        # K+P imx53 DDC

              - kiebackpeter,imx53-hsc        # K+P imx53 HSC

              - menlo,m53menlo                # i.MX53 Menlo board

              - starterkit,sk-imx53

              - voipac,imx53-dmm-668          # Voipac i.MX53 X53-DMM-668

          - const: fsl,imx53
@@ -644,6 +702,16 @@ properties: 
          - const: armadeus,imx6ull-opos6ul     # OPOS6UL (i.MX6ULL) SoM

          - const: fsl,imx6ull



      - description: i.MX6ULL DHCOM SoM based Boards

        items:

          - enum:

              - dh,imx6ull-dhcom-drc02

              - dh,imx6ull-dhcom-pdk2

              - dh,imx6ull-dhcom-picoitx

          - const: dh,imx6ull-dhcom-som # The DHCOR is soldered on the DHCOM

          - const: dh,imx6ull-dhcor-som

          - const: fsl,imx6ull



      - description: i.MX6ULL PHYTEC phyBOARD-Segin

        items:

          - enum:
@@ -815,7 +883,6 @@ properties: 
          - enum:

              - beacon,imx8mm-beacon-kit  # i.MX8MM Beacon Development Kit

              - boundary,imx8mm-nitrogen8mm  # i.MX8MM Nitrogen Board

              - cloos,imx8mm-phg          # i.MX8MM Cloos PHG Board

              - dmo,imx8mm-data-modul-edm-sbc # i.MX8MM eDM SBC

              - emtrion,emcon-mx8mm-avari # emCON-MX8MM SoM on Avari Base

              - fsl,imx8mm-ddr4-evk       # i.MX8MM DDR4 EVK Board
@@ -830,7 +897,6 @@ properties: 
              - innocomm,wb15-evk         # i.MX8MM Innocomm EVK board with WB15 SoM

              - kontron,imx8mm-sl         # i.MX8MM Kontron SL (N801X) SOM

              - kontron,imx8mm-osm-s      # i.MX8MM Kontron OSM-S (N802X) SOM

              - menlo,mx8menlo            # i.MX8MM Menlo board with Verdin SoM

              - toradex,verdin-imx8mm     # Verdin iMX8M Mini Modules

              - toradex,verdin-imx8mm-nonwifi  # Verdin iMX8M Mini Modules without Wi-Fi / BT

              - toradex,verdin-imx8mm-wifi  # Verdin iMX8M Mini Wi-Fi / BT Modules
@@ -861,8 +927,10 @@ properties: 
      - description: Toradex Boards with Verdin iMX8M Mini Modules

        items:

          - enum:

              - menlo,mx8menlo                       # Verdin iMX8M Mini Module on i.MX8MM Menlo board

              - toradex,verdin-imx8mm-nonwifi-dahlia # Verdin iMX8M Mini Module on Dahlia

              - toradex,verdin-imx8mm-nonwifi-dev    # Verdin iMX8M Mini Module on Verdin Development Board

              - toradex,verdin-imx8mm-nonwifi-yavia  # Verdin iMX8M Mini Module on Yavia

          - const: toradex,verdin-imx8mm-nonwifi     # Verdin iMX8M Mini Module without Wi-Fi / BT

          - const: toradex,verdin-imx8mm             # Verdin iMX8M Mini Module

          - const: fsl,imx8mm
@@ -872,6 +940,7 @@ properties: 
          - enum:

              - toradex,verdin-imx8mm-wifi-dahlia # Verdin iMX8M Mini Wi-Fi / BT Module on Dahlia

              - toradex,verdin-imx8mm-wifi-dev    # Verdin iMX8M Mini Wi-Fi / BT M. on Verdin Development B.

              - toradex,verdin-imx8mm-wifi-yavia  # Verdin iMX8M Mini Wi-Fi / BT Module on Yavia

          - const: toradex,verdin-imx8mm-wifi     # Verdin iMX8M Mini Wi-Fi / BT Module

          - const: toradex,verdin-imx8mm          # Verdin iMX8M Mini Module

          - const: fsl,imx8mm
@@ -895,6 +964,7 @@ properties: 
          one compatible is needed.

        items:

          - enum:

              - cloos,imx8mm-phg           # i.MX8MM Cloos PHG Board

              - tq,imx8mm-tqma8mqml-mba8mx # TQ-Systems GmbH i.MX8MM TQMa8MQML SOM on MBa8Mx

          - const: tq,imx8mm-tqma8mqml     # TQ-Systems GmbH i.MX8MM TQMa8MQML SOM

          - const: fsl,imx8mm
@@ -931,10 +1001,11 @@ properties: 
      - description: i.MX8MP based Boards

        items:

          - enum:

              - dh,imx8mp-dhcom-som       # i.MX8MP DHCOM SoM

              - dh,imx8mp-dhcom-pdk2      # i.MX8MP DHCOM SoM on PDK2 board

              - beacon,imx8mp-beacon-kit  # i.MX8MP Beacon Development Kit

              - fsl,imx8mp-evk            # i.MX8MP EVK Board

              - gateworks,imx8mp-gw74xx   # 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

              - toradex,verdin-imx8mp-nonwifi  # Verdin iMX8M Plus Modules without Wi-Fi / BT

              - toradex,verdin-imx8mp-wifi  # Verdin iMX8M Plus Wi-Fi / BT Modules
@@ -947,6 +1018,12 @@ properties: 
          - const: avnet,sm2s-imx8mp              # SM2S-IMX8PLUS SoM

          - const: fsl,imx8mp



      - description: i.MX8MP DHCOM based Boards

        items:

          - const: dh,imx8mp-dhcom-pdk2      # i.MX8MP DHCOM SoM on PDK2 board

          - const: dh,imx8mp-dhcom-som       # i.MX8MP DHCOM SoM

          - const: fsl,imx8mp



      - description: Engicam i.Core MX8M Plus SoM based boards

        items:

          - enum:
@@ -965,6 +1042,7 @@ properties: 
          - enum:

              - toradex,verdin-imx8mp-nonwifi-dahlia # Verdin iMX8M Plus Module on Dahlia

              - toradex,verdin-imx8mp-nonwifi-dev    # Verdin iMX8M Plus Module on Verdin Development Board

              - toradex,verdin-imx8mp-nonwifi-yavia  # Verdin iMX8M Plus Module on Yavia

          - const: toradex,verdin-imx8mp-nonwifi     # Verdin iMX8M Plus Module without Wi-Fi / BT

          - const: toradex,verdin-imx8mp             # Verdin iMX8M Plus Module

          - const: fsl,imx8mp
@@ -974,6 +1052,7 @@ properties: 
          - enum:

              - toradex,verdin-imx8mp-wifi-dahlia # Verdin iMX8M Plus Wi-Fi / BT Module on Dahlia

              - toradex,verdin-imx8mp-wifi-dev    # Verdin iMX8M Plus Wi-Fi / BT M. on Verdin Development B.

              - toradex,verdin-imx8mp-wifi-yavia  # Verdin iMX8M Plus Wi-Fi / BT Module on Yavia

          - const: toradex,verdin-imx8mp-wifi     # Verdin iMX8M Plus Wi-Fi / BT Module

          - const: toradex,verdin-imx8mp          # Verdin iMX8M Plus Module

          - const: fsl,imx8mp
@@ -999,12 +1078,17 @@ properties: 
              - fsl,imx8mq-evk            # i.MX8MQ EVK Board

              - google,imx8mq-phanbell    # Google Coral Edge TPU

              - kontron,pitx-imx8m        # Kontron pITX-imx8m Board

              - mntre,reform2             # MNT Reform2 Laptop

              - purism,librem5-devkit     # Purism Librem5 devkit

              - solidrun,hummingboard-pulse # SolidRun Hummingboard Pulse

              - technexion,pico-pi-imx8m  # TechNexion PICO-PI-8M evk

          - const: fsl,imx8mq



      - description: i.MX8MQ NITROGEN SoM based Boards

        items:

          - const: mntre,reform2                  # MNT Reform2 Laptop

          - const: boundary,imx8mq-nitrogen8m-som # i.MX8MQ NITROGEN SoM

          - const: fsl,imx8mq



      - description: Purism Librem5 phones

        items:

          - enum:

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

+14 −5
Original line number Diff line number Diff line
@@ -23,11 +23,16 @@ description: | 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - fsl,imx6q-gpc

      - items:

          - enum:

              - fsl,imx6qp-gpc

              - fsl,imx6sl-gpc

              - fsl,imx6sx-gpc

              - fsl,imx6ul-gpc

          - const: fsl,imx6q-gpc



  reg:

    maxItems: 1
@@ -35,6 +40,10 @@ properties: 
  interrupts:

    maxItems: 1



  interrupt-controller: true

  '#interrupt-cells':

    const: 3



  clocks:

    maxItems: 1

Documentation/devicetree/bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/soc/imx/fsl,imx-iomuxc-gpr.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Freescale IOMUX Controller General Purpose Registers



maintainers:

  - Peng Fan <peng.fan@nxp.com>



description:

  i.MX Processors have an IOMUXC General Purpose Register group for

  various System Settings



properties:

  compatible:

    oneOf:

      - items:

          - const: fsl,imx8mq-iomuxc-gpr

          - const: syscon

          - const: simple-mfd

      - items:

          - enum:

              - fsl,imx8mm-iomuxc-gpr

              - fsl,imx8mn-iomuxc-gpr

              - fsl,imx8mp-iomuxc-gpr

          - const: syscon



  reg:

    maxItems: 1



  mux-controller:

    type: object

    $ref: /schemas/mux/reg-mux.yaml



additionalProperties: false



required:

  - compatible

  - reg



examples:

  # Pinmux controller node

  - |

    iomuxc_gpr: syscon@30340000 {

        compatible = "fsl,imx8mq-iomuxc-gpr", "syscon", "simple-mfd";

        reg = <0x30340000 0x10000>;



        mux: mux-controller {

            compatible = "mmio-mux";

            #mux-control-cells = <1>;

            mux-reg-masks = <0x34 0x00000004>; /* MIPI_MUX_SEL */

        };

    };



...

Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ properties: 
      - const: pcie

      - const: pcie-phy



  '#clock-cells':

    const: 0



  clocks:

    minItems: 2

    maxItems: 2
@@ -85,4 +88,5 @@ examples: 
        power-domain-names = "bus", "usb", "usb-phy1",

                             "usb-phy2", "pcie", "pcie-phy";

        #power-domain-cells = <1>;

        #clock-cells = <0>;

    };

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -1031,6 +1031,8 @@ patternProperties: 
    description: PocketBook International SA

  "^polaroid,.*":

    description: Polaroid Corporation

  "^polyhex,.*":

    description: Polyhex Technology Co. Ltd.

  "^portwell,.*":

    description: Portwell Inc.

  "^poslab,.*":
@@ -1252,6 +1254,8 @@ patternProperties: 
    description: Starry Electronic Technology (ShenZhen) Co., LTD

  "^startek,.*":

    description: Startek

  "^starterkit,.*":

    description: Starterkit

  "^ste,.*":

    description: ST-Ericsson

    deprecated: true