Unverified Commit 3d09c0df authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX dt-bindings update for 5.19:

- Various board compatible additions to fsl.yaml.
- Update fsl-imx-dma bindings to deprecate '#dma-channels' and
  '#dma-requests'.
- Add bindings for i.MX8MP HDMI and media block control.
- Add vendor prefix for Storopack.

* tag 'imx-bindings-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: arm: Add bosch acc board
  dt-bindings: arm: fsl: Add Storopack i.MX7D SMEGW01 board
  dt-bindings: vendor-prefixes: Add prefix for Storopack
  dt-bindings: dmaengine: fsl-imx: deprecate '#dma-channels' and '#dma-requests'
  dt-bindings: arm: fsl: add toradex,colibri-imx6ull
  dt-bindings: arm: fsl: Add Engicam i.Core MX8M Plus EDIMM2.2 Starter Kit
  dt-bindings: arm: fsl: add ls1021a-iot board
  dt-bindings: arm: Add i.MX8M Mini Toradex Verdin based Menlo board
  dt-bindings: arm: Add i.MX8M Plus Gateworks GW74xx board
  dt-bindings: arm: fsl: add IMX8MN DDR3L eval board
  dt-bindings: arm: fsl: Add carriers for toradex,colibri-imx6dl
  dt-bindings: arm: fsl: imx6dl-colibri: Drop dedicated v1.1 bindings
  dt-bindings: arm: fsl: add toradex,verdin-imx8mp et al.
  dt-bindings: arm: Add i.MX53 based Menlo board comment
  dt-bindings: arm: fsl: add PHYTEC phyGATE Tauri i.MX6 ULL
  dt-bindings: arm: fsl: add TQ Systems boards based on i.MX6UL(L)
  dt-bindings: arm: Add Data Modul i.MX8M Mini eDM SBC
  dt-bindings: soc: add binding for i.MX8MP HDMI blk-ctrl
  dt-bindings: power: imx8mp: add defines for HDMI blk-ctrl domains
  dt-bindings: soc: Add i.MX8MP media block control DT bindings

Link: https://lore.kernel.org/r/20220508033843.2773685-1-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 168b43ac 75f9d540

Documentation/devicetree/bindings/arm/fsl.yaml

+102 −17
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ properties: 
              - karo,tx53                     # Ka-Ro electronics TX53 module

              - kiebackpeter,imx53-ddc        # K+P imx53 DDC

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

              - menlo,m53menlo

              - menlo,m53menlo                # i.MX53 Menlo board

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

          - const: fsl,imx53
@@ -192,6 +192,7 @@ properties: 
        items:

          - enum:

              - auvidea,h100              # Auvidea H100

              - bosch,imx6q-acc           # Bosch ACC i.MX6 Dual

              - boundary,imx6q-nitrogen6_max

              - boundary,imx6q-nitrogen6_som2

              - boundary,imx6q-nitrogen6x
@@ -411,7 +412,6 @@ properties: 
              - technologic,imx6dl-ts4900

              - technologic,imx6dl-ts7970

              - toradex,colibri_imx6dl      # Colibri iMX6 Modules

              - toradex,colibri_imx6dl-v1_1 # Colibri iMX6 V1.1 Modules

              - udoo,imx6dl-udoo          # Udoo i.MX6 Dual-lite Board

              - vdl,lanmcu                # Van der Laan LANMCU board

              - wand,imx6dl-wandboard     # Wandboard i.MX6 Dual Lite Board
@@ -488,17 +488,13 @@ properties: 
      - description: i.MX6DL Boards with Toradex Colibri iMX6DL/S Modules

        items:

          - enum:

              - toradex,colibri_imx6dl-aster        # Colibri iMX6DL/S Module on Aster Board

              - toradex,colibri_imx6dl-eval-v3      # Colibri iMX6DL/S Module on Colibri Evaluation Board V3

              - toradex,colibri_imx6dl-iris         # Colibri iMX6DL/S Module on Iris Board

              - toradex,colibri_imx6dl-iris-v2      # Colibri iMX6DL/S Module on Iris Board V2

          - const: toradex,colibri_imx6dl           # Colibri iMX6DL/S Module

          - const: fsl,imx6dl



      - description: i.MX6DL Boards with Toradex Colibri iMX6DL/S V1.1 Modules

        items:

          - enum:

              - toradex,colibri_imx6dl-v1_1-eval-v3 # Colibri iMX6DL/S V1.1 M. on Colibri Evaluation Board V3

          - const: toradex,colibri_imx6dl-v1_1      # Colibri iMX6DL/S V1.1 Module

          - const: fsl,imx6dl



      - description: i.MX6S DHCOM DRC02 Board

        items:

          - const: dh,imx6s-dhcom-drc02
@@ -613,6 +609,28 @@ properties: 
          - const: kontron,imx6ul-n6310-som

          - const: fsl,imx6ul



      - description: TQ-Systems TQMa6UL1 SoM on MBa6ULx board

        items:

          - enum:

              - tq,imx6ul-tqma6ul1-mba6ulx

          - const: tq,imx6ul-tqma6ul1      # MCIMX6G1

          - const: fsl,imx6ul



      - description: TQ-Systems TQMa6UL2 SoM on MBa6ULx board

        items:

          - enum:

              - tq,imx6ul-tqma6ul2-mba6ulx

          - const: tq,imx6ul-tqma6ul2      # MCIMX6G2

          - const: fsl,imx6ul



      - description: TQ-Systems TQMa6ULxL SoM on MBa6ULx[L] board

        items:

          - enum:

              - tq,imx6ul-tqma6ul2l-mba6ulx # using LGA adapter

              - tq,imx6ul-tqma6ul2l-mba6ulxl

          - const: tq,imx6ul-tqma6ul2l      # MCIMX6G2, LGA SoM variant

          - const: fsl,imx6ul



      - description: i.MX6ULL based Boards

        items:

          - enum:
@@ -640,26 +658,44 @@ properties: 
          - const: phytec,imx6ull-pcl063  # PHYTEC phyCORE-i.MX 6ULL

          - const: fsl,imx6ull



      - description: i.MX6ULL PHYTEC phyGATE-Tauri

        items:

          - enum:

              - phytec,imx6ull-phygate-tauri-emmc

              - phytec,imx6ull-phygate-tauri-nand

          - const: phytec,imx6ull-phygate-tauri # PHYTEC phyGATE-Tauri with i.MX6 ULL

          - const: phytec,imx6ull-pcl063        # PHYTEC phyCORE-i.MX 6ULL

          - const: fsl,imx6ull



      - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Modules

        items:

          - enum:

              - toradex,colibri-imx6ull-eval      # Colibri iMX6ULL Module on Colibri Evaluation Board

              - toradex,colibri-imx6ull-aster     # Colibri iMX6ULL Module on Aster Carrier Board

              - toradex,colibri-imx6ull-eval      # Colibri iMX6ULL Module on Colibri Evaluation Board V3

              - toradex,colibri-imx6ull-iris      # Colibri iMX6ULL Module on Iris Carrier Board

              - toradex,colibri-imx6ull-iris-v2   # Colibri iMX6ULL Module on Iris V2 Carrier Board

          - const: toradex,colibri-imx6ull        # Colibri iMX6ULL Module

          - const: fsl,imx6dl

          - const: fsl,imx6ull



      - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL 1GB (eMMC) Module

        items:

          - enum:

              - toradex,colibri-imx6ull-emmc-eval # Colibri iMX6ULL 1GB (eMMC) M. on Colibri Evaluation Board

              - toradex,colibri-imx6ull-emmc-aster     # Colibri iMX6ULL 1G (eMMC) on Aster Carrier Board

              - toradex,colibri-imx6ull-emmc-eval      # Colibri iMX6ULL 1G (eMMC) on Colibri Evaluation B. V3

              - toradex,colibri-imx6ull-emmc-iris      # Colibri iMX6ULL 1G (eMMC) on Iris Carrier Board

              - toradex,colibri-imx6ull-emmc-iris-v2   # Colibri iMX6ULL 1G (eMMC) on Iris V2 Carrier Board

          - const: toradex,colibri-imx6ull-emmc        # Colibri iMX6ULL 1GB (eMMC) Module

          - const: fsl,imx6dl

          - const: fsl,imx6ull



      - description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Wi-Fi / BT Modules

        items:

          - enum:

              - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT M. on Colibri Evaluation Board

              - toradex,colibri-imx6ull-wifi-eval     # Colibri iMX6ULL Wi-Fi / BT M. on Colibri Eval. B. V3

              - toradex,colibri-imx6ull-wifi-aster    # Colibri iMX6ULL Wi-Fi / BT M. on Aster Carrier Board

              - toradex,colibri-imx6ull-wifi-iris     # Colibri iMX6ULL Wi-Fi / BT M. on Iris Carrier Board

              - toradex,colibri-imx6ull-wifi-iris-v2  # Colibri iMX6ULL Wi-Fi / BT M. on Iris V2 Carrier Board

          - const: toradex,colibri-imx6ull-wifi       # Colibri iMX6ULL Wi-Fi / BT Module

          - const: fsl,imx6dl

          - const: fsl,imx6ull



      - description: Kontron N6411 S Board

        items:
@@ -667,6 +703,21 @@ properties: 
          - const: kontron,imx6ull-n6411-som

          - const: fsl,imx6ull



      - description: TQ Systems TQMa6ULLx SoM on MBa6ULx board

        items:

          - enum:

              - tq,imx6ull-tqma6ull2-mba6ulx

          - const: tq,imx6ull-tqma6ull2      # MCIMX6Y2

          - const: fsl,imx6ull



      - description: TQ Systems TQMa6ULLxL SoM on MBa6ULx[L] board

        items:

          - enum:

              - tq,imx6ull-tqma6ull2l-mba6ulx # using LGA adapter

              - tq,imx6ull-tqma6ull2l-mba6ulxl

          - const: tq,imx6ull-tqma6ull2l      # MCIMX6Y2, LGA SoM variant

          - const: fsl,imx6ull



      - description: i.MX6ULZ based Boards

        items:

          - enum:
@@ -707,6 +758,7 @@ properties: 
              - kam,imx7d-flex-concentrator-mfg   # Kamstrup OMNIA Flex Concentrator in manufacturing mode

              - novtech,imx7d-meerkat96   # i.MX7 Meerkat96 Board

              - remarkable,imx7d-remarkable2  # i.MX7D ReMarkable 2 E-Ink Tablet

              - storopack,imx7d-smegw01       # Storopack i.MX7D SMEGW01

              - technexion,imx7d-pico-dwarf   # TechNexion i.MX7D Pico-Dwarf

              - technexion,imx7d-pico-hobbit  # TechNexion i.MX7D Pico-Hobbit

              - technexion,imx7d-pico-nymph   # TechNexion i.MX7D Pico-Nymph
@@ -762,6 +814,7 @@ properties: 
          - enum:

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

              - boundary,imx8mm-nitrogen8mm  # i.MX8MM Nitrogen 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

              - fsl,imx8mm-evk            # i.MX8MM EVK Board
@@ -772,6 +825,7 @@ properties: 
              - gw,imx8mm-gw7902          # i.MX8MM Gateworks Board

              - gw,imx8mm-gw7903          # i.MX8MM Gateworks Board

              - kontron,imx8mm-n801x-som  # i.MX8MM Kontron SL (N801X) 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
@@ -834,6 +888,7 @@ properties: 
              - beacon,imx8mn-beacon-kit  # i.MX8MN Beacon Development Kit

              - bsh,imx8mn-bsh-smm-s2     # i.MX8MN BSH SystemMaster S2

              - bsh,imx8mn-bsh-smm-s2pro  # i.MX8MN BSH SystemMaster S2 PRO

              - fsl,imx8mn-ddr3l-evk      # i.MX8MN DDR3L EVK Board

              - fsl,imx8mn-ddr4-evk       # i.MX8MN DDR4 EVK Board

              - fsl,imx8mn-evk            # i.MX8MN LPDDR4 EVK Board

              - gw,imx8mn-gw7902          # i.MX8MM Gateworks Board
@@ -860,6 +915,17 @@ properties: 
        items:

          - enum:

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

              - gateworks,imx8mp-gw74xx   # i.MX8MP Gateworks 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

          - const: fsl,imx8mp



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

        items:

          - enum:

              - engicam,icore-mx8mp-edimm2.2       # i.MX8MP Engicam i.Core MX8M Plus EDIMM2.2 Starter Kit

          - const: engicam,icore-mx8mp             # i.MX8MP Engicam i.Core MX8M Plus SoM

          - const: fsl,imx8mp



      - description: PHYTEC phyCORE-i.MX8MP SoM based boards
@@ -868,6 +934,24 @@ properties: 
          - const: phytec,imx8mp-phycore-som         # phyCORE-i.MX8MP SoM

          - const: fsl,imx8mp



      - description: Toradex Boards with Verdin iMX8M Plus Modules

        items:

          - 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

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

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

          - const: fsl,imx8mp



      - description: Toradex Boards with Verdin iMX8M Plus Wi-Fi / BT Modules

        items:

          - 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.

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

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

          - const: fsl,imx8mp



      - description: i.MX8MQ based Boards

        items:

          - enum:
@@ -999,6 +1083,7 @@ properties: 
      - description: LS1021A based Boards

        items:

          - enum:

              - fsl,ls1021a-iot

              - fsl,ls1021a-moxa-uc-8410a

              - fsl,ls1021a-qds

              - fsl,ls1021a-tsn

Documentation/devicetree/bindings/dma/fsl-imx-dma.txt

+5 −3
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ Required properties: 
- #dma-cells : Has to be 1. imx-dma does not support anything else.



Optional properties:

- #dma-channels : Number of DMA channels supported. Should be 16.

- #dma-requests : Number of DMA requests supported.

- dma-channels : Number of DMA channels supported. Should be 16.

- #dma-channels : deprecated

- dma-requests : Number of DMA requests supported.

- #dma-requests : deprecated



Example:
@@ -23,7 +25,7 @@ Example: 
		reg = <0x10001000 0x1000>;

		interrupts = <32 33>;

		#dma-cells = <1>;

		#dma-channels = <16>;

		dma-channels = <16>;

	};

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

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml#

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



title: NXP i.MX8MP HDMI blk-ctrl



maintainers:

  - Lucas Stach <l.stach@pengutronix.de>



description:

  The i.MX8MP HDMMI blk-ctrl is a top-level peripheral providing access to

  the NoC and ensuring proper power sequencing of the display pipeline

  peripherals located in the HDMI domain of the SoC.



properties:

  compatible:

    items:

      - const: fsl,imx8mp-hdmi-blk-ctrl

      - const: syscon



  reg:

    maxItems: 1



  '#power-domain-cells':

    const: 1



  power-domains:

    minItems: 8

    maxItems: 8



  power-domain-names:

    items:

      - const: bus

      - const: irqsteer

      - const: lcdif

      - const: pai

      - const: pvi

      - const: trng

      - const: hdmi-tx

      - const: hdmi-tx-phy



  clocks:

    minItems: 4

    maxItems: 4



  clock-names:

    items:

      - const: apb

      - const: axi

      - const: ref_266m

      - const: ref_24m



required:

  - compatible

  - reg

  - power-domains

  - power-domain-names

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/imx8mp-clock.h>

    #include <dt-bindings/power/imx8mp-power.h>



    blk-ctrl@32fc0000 {

        compatible = "fsl,imx8mp-hdmi-blk-ctrl", "syscon";

        reg = <0x32fc0000 0x23c>;

        clocks = <&clk IMX8MP_CLK_HDMI_APB>,

                 <&clk IMX8MP_CLK_HDMI_ROOT>,

                 <&clk IMX8MP_CLK_HDMI_REF_266M>,

                 <&clk IMX8MP_CLK_HDMI_24M>;

        clock-names = "apb", "axi", "ref_266m", "ref_24m";

        power-domains = <&pgc_hdmimix>, <&pgc_hdmimix>, <&pgc_hdmimix>,

                        <&pgc_hdmimix>, <&pgc_hdmimix>, <&pgc_hdmimix>,

                        <&pgc_hdmimix>, <&pgc_hdmi_phy>;

        power-domain-names = "bus", "irqsteer", "lcdif", "pai", "pvi", "trng",

                             "hdmi-tx", "hdmi-tx-phy";

        #power-domain-cells = <1>;

    };

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

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/soc/imx/fsl,imx8mp-media-blk-ctrl.yaml#

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



title: NXP i.MX8MP Media Block Control



maintainers:

  - Paul Elder <paul.elder@ideasonboard.com>



description:

  The i.MX8MP Media Block Control (MEDIA BLK_CTRL) is a top-level peripheral

  providing access to the NoC and ensuring proper power sequencing of the

  peripherals within the MEDIAMIX domain.



properties:

  compatible:

    items:

      - const: fsl,imx8mp-media-blk-ctrl

      - const: syscon



  reg:

    maxItems: 1



  '#power-domain-cells':

    const: 1



  power-domains:

    maxItems: 10



  power-domain-names:

    items:

      - const: bus

      - const: mipi-dsi1

      - const: mipi-csi1

      - const: lcdif1

      - const: isi

      - const: mipi-csi2

      - const: lcdif2

      - const: isp

      - const: dwe

      - const: mipi-dsi2



  clocks:

    items:

      - description: The APB clock

      - description: The AXI clock

      - description: The pixel clock for the first CSI2 receiver (aclk)

      - description: The pixel clock for the second CSI2 receiver (aclk)

      - description: The pixel clock for the first LCDIF (pix_clk)

      - description: The pixel clock for the second LCDIF (pix_clk)

      - description: The core clock for the ISP (clk)

      - description: The MIPI-PHY reference clock used by DSI



  clock-names:

    items:

      - const: apb

      - const: axi

      - const: cam1

      - const: cam2

      - const: disp1

      - const: disp2

      - const: isp

      - const: phy



required:

  - compatible

  - reg

  - '#power-domain-cells'

  - power-domains

  - power-domain-names

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/imx8mp-clock.h>

    #include <dt-bindings/power/imx8mp-power.h>



    media_blk_ctl: blk-ctl@32ec0000 {

        compatible = "fsl,imx8mp-media-blk-ctrl", "syscon";

        reg = <0x32ec0000 0x138>;

        power-domains = <&mediamix_pd>, <&mipi_phy1_pd>, <&mipi_phy1_pd>,

                        <&mediamix_pd>, <&mediamix_pd>, <&mipi_phy2_pd>,

                        <&mediamix_pd>, <&ispdwp_pd>, <&ispdwp_pd>,

                        <&mipi_phy2_pd>;

        power-domain-names = "bus", "mipi-dsi1", "mipi-csi1", "lcdif1", "isi",

                             "mipi-csi2", "lcdif2", "isp1", "dwe", "mipi-dsi2";

        clocks = <&clk IMX8MP_CLK_MEDIA_APB_ROOT>,

                 <&clk IMX8MP_CLK_MEDIA_AXI_ROOT>,

                 <&clk IMX8MP_CLK_MEDIA_CAM1_PIX_ROOT>,

                 <&clk IMX8MP_CLK_MEDIA_CAM2_PIX_ROOT>,

                 <&clk IMX8MP_CLK_MEDIA_DISP1_PIX_ROOT>,

                 <&clk IMX8MP_CLK_MEDIA_DISP2_PIX_ROOT>,

                 <&clk IMX8MP_CLK_MEDIA_ISP_ROOT>,

                 <&clk IMX8MP_CLK_MEDIA_MIPI_PHY1_REF_ROOT>;

        clock-names = "apb", "axi", "cam1", "cam2", "disp1", "disp2",

                      "isp", "phy";

        #power-domain-cells = <1>;

    };

...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,8 @@ patternProperties: 
    description: StorLink Semiconductors, Inc.

  "^storm,.*":

    description: Storm Semiconductor, Inc.

  "^storopack,.*":

    description: Storopack

  "^summit,.*":

    description: Summit microelectronics

  "^sunchip,.*":