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

Merge tag 'imx-drivers-6.1' of... 

Merge tag 'imx-drivers-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/drivers

i.MX drivers change for 6.1:

- Update i.MX8MP blk-ctrl driver to handle PCIe PHY reset bit.
- Add interconnect support into i.MX8MP blk-ctrl driver, so that i.MX8MP
  NoC can be set up properly after related power domain is up.
- Add blk-ctrl support for i.MX8MP HDMI HDCP/HRV and VPU block.
- Add i.MX93 SRC power domain and MEDIA blk-ctrl driver.
- Update imx8m-blk-ctrl driver to use genpd_xlate_onecell.

* tag 'imx-drivers-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (26 commits)
  soc: imx: add i.MX93 media blk ctrl driver
  soc: imx: add i.MX93 SRC power domain driver
  soc: imx: imx8m-blk-ctrl: Use genpd_xlate_onecell
  soc: imx: imx8mp-blk-ctrl: handle PCIe PHY resets
  soc: imx: imx8m-blk-ctrl: add i.MX8MP VPU blk ctrl
  soc: imx: add i.MX8MP HDMI blk ctrl HDCP/HRV_MWR
  soc: imx: add icc paths for i.MX8MP hsio/hdmi blk ctrl
  soc: imx: add icc paths for i.MX8MP media blk ctrl
  dt-bindings: arm: imx: update fsl.yaml for imx8dxl
  dt-bindings: firmware: add missing resource IDs for imx8dxl
  dt-bindings: arm: Add i.MX8M Mini Gateworks GW7904 board
  dt-bindings: soc: add i.MX93 mediamix blk ctrl
  dt-bindings: soc: add i.MX93 SRC
  dt-bindings: mfd: syscon: Add i.MX93 blk ctrl system registers
  dt-bindings: arm: fsl: Add MSC SM2S-IMX8PLUS SoM and SM2-MB-EP1 Carrier
  dt-bindings: arm: fsl: Add Kontron BL i.MX8MM OSM-S board
  dt-bindings: arm: fsl: Rename compatibles for Kontron i.MX8MM SoM/board
  dt-bindings: soc: imx: add i.MX8MP vpu blk ctrl
  dt-bindings: soc: imx: add interconnect property for i.MX8MM vpu blk ctrl
  dt-bindings: soc: imx: drop minItems for i.MX8MM vpu blk ctrl
  ...

Link: https://lore.kernel.org/r/20220918092806.2152700-2-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a30f202f e9aa77d4

Documentation/devicetree/bindings/arm/fsl.yaml

+36 −22
Original line number Diff line number Diff line
@@ -554,8 +554,7 @@ properties: 
              - engicam,imx6ul-isiot      # Engicam Is.IoT MX6UL eMMC/NAND Starter kit

              - fsl,imx6ul-14x14-evk      # i.MX6 UltraLite 14x14 EVK Board

              - karo,imx6ul-tx6ul         # Ka-Ro electronics TXUL-0010 Module

              - kontron,imx6ul-n6310-som  # Kontron N6310 SOM

              - kontron,imx6ul-n6311-som  # Kontron N6311 SOM

              - kontron,sl-imx6ul         # Kontron SL i.MX6UL SoM

              - prt,prti6g                # Protonic PRTI6G Board

              - technexion,imx6ul-pico-dwarf   # TechNexion i.MX6UL Pico-Dwarf

              - technexion,imx6ul-pico-hobbit  # TechNexion i.MX6UL Pico-Hobbit
@@ -591,23 +590,17 @@ properties: 
          - const: phytec,imx6ul-pcl063   # PHYTEC phyCORE-i.MX 6UL

          - const: fsl,imx6ul



      - description: Kontron N6310 S Board

      - description: Kontron BL i.MX6UL (N631X S) Board

        items:

          - const: kontron,imx6ul-n6310-s

          - const: kontron,imx6ul-n6310-som

          - const: kontron,bl-imx6ul       # Kontron BL i.MX6UL Carrier Board

          - const: kontron,sl-imx6ul       # Kontron SL i.MX6UL SoM

          - const: fsl,imx6ul



      - description: Kontron N6311 S Board

      - description: Kontron BL i.MX6UL 43 (N631X S 43) Board

        items:

          - const: kontron,imx6ul-n6311-s

          - const: kontron,imx6ul-n6311-som

          - const: fsl,imx6ul



      - description: Kontron N6310 S 43 Board

        items:

          - const: kontron,imx6ul-n6310-s-43

          - const: kontron,imx6ul-n6310-s

          - const: kontron,imx6ul-n6310-som

          - const: kontron,bl-imx6ul-43    # Kontron BL i.MX6UL Carrier Board with 4.3" Display

          - const: kontron,bl-imx6ul       # Kontron BL i.MX6UL Carrier Board

          - const: kontron,sl-imx6ul       # Kontron SL i.MX6UL SoM

          - const: fsl,imx6ul



      - description: TQ-Systems TQMa6UL1 SoM on MBa6ULx board
@@ -637,7 +630,7 @@ properties: 
          - enum:

              - fsl,imx6ull-14x14-evk     # i.MX6 UltraLiteLite 14x14 EVK Board

              - joz,jozacp                # JOZ Access Point

              - kontron,imx6ull-n6411-som # Kontron N6411 SOM

              - kontron,sl-imx6ull        # Kontron SL i.MX6ULL SoM

              - myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board

              - toradex,colibri-imx6ull      # Colibri iMX6ULL Modules

              - toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
@@ -698,10 +691,10 @@ properties: 
          - const: toradex,colibri-imx6ull-wifi       # Colibri iMX6ULL Wi-Fi / BT Module

          - const: fsl,imx6ull



      - description: Kontron N6411 S Board

      - description: Kontron BL i.MX6ULL (N6411 S) Board

        items:

          - const: kontron,imx6ull-n6411-s

          - const: kontron,imx6ull-n6411-som

          - const: kontron,bl-imx6ull   # Kontron BL i.MX6ULL Carrier Board

          - const: kontron,sl-imx6ull   # Kontron SL i.MX6ULL SoM

          - const: fsl,imx6ull



      - description: TQ Systems TQMa6ULLx SoM on MBa6ULx board
@@ -825,13 +818,15 @@ properties: 
              - 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

              - gateworks,imx8mm-gw7904

              - 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

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

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

              - kontron,imx8mm-n801x-som  # i.MX8MM Kontron SL (N801X) 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
@@ -850,8 +845,14 @@ properties: 


      - description: Kontron BL i.MX8MM (N801X S) Board

        items:

          - const: kontron,imx8mm-n801x-s

          - const: kontron,imx8mm-n801x-som

          - const: kontron,imx8mm-bl

          - const: kontron,imx8mm-sl

          - const: fsl,imx8mm



      - description: Kontron BL i.MX8MM OSM-S (N802X S) Board

        items:

          - const: kontron,imx8mm-bl-osm-s

          - const: kontron,imx8mm-osm-s

          - const: fsl,imx8mm



      - description: Toradex Boards with Verdin iMX8M Mini Modules
@@ -936,6 +937,13 @@ properties: 
              - toradex,verdin-imx8mp-wifi  # Verdin iMX8M Plus Wi-Fi / BT Modules

          - const: fsl,imx8mp



      - description: Avnet (MSC Branded) Boards with SM2S i.MX8M Plus Modules

        items:

          - const: avnet,sm2s-imx8mp-14N0600E-ep1 # SM2S-IMX8PLUS-14N0600E on SM2-MB-EP1 Carrier Board

          - const: avnet,sm2s-imx8mp-14N0600E     # 14N0600E variant of SM2S-IMX8PLUS SoM

          - const: avnet,sm2s-imx8mp              # SM2S-IMX8PLUS SoM

          - const: fsl,imx8mp



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

        items:

          - enum:
@@ -1034,6 +1042,12 @@ properties: 
              - toradex,colibri-imx8x     # Colibri iMX8X Modules

          - const: fsl,imx8qxp



      - description: i.MX8DXL based Boards

        items:

          - enum:

              - fsl,imx8dxl-evk           # i.MX8DXL EVK Board

          - const: fsl,imx8dxl



      - description: i.MX8QXP Boards with Toradex Coilbri iMX8X Modules

        items:

          - enum:

Documentation/devicetree/bindings/mfd/syscon.yaml

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ properties: 
              - allwinner,sun50i-a64-system-controller

              - brcm,cru-clkset

              - freecom,fsg-cs2-system-controller

              - fsl,imx93-aonmix-ns-syscfg

              - fsl,imx93-wakeupmix-syscfg

              - hisilicon,dsa-subctrl

              - hisilicon,hi6220-sramctrl

              - hisilicon,pcie-sas-subctrl

Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml

+99 −11
Original line number Diff line number Diff line
@@ -27,9 +27,46 @@ properties: 
    const: 1



  power-domains:

    minItems: 4

    maxItems: 4



  power-domain-names:

    maxItems: 4



  clocks:

    maxItems: 3



  clock-names:

    maxItems: 3



  interconnects:

    maxItems: 3



  interconnect-names:

    maxItems: 3



required:

  - compatible

  - reg

  - power-domains

  - power-domain-names

  - clocks

  - clock-names



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: fsl,imx8mm-vpu-blk-ctrl

    then:

      properties:

        power-domains:

          items:

            - description: bus power domain

            - description: G1 decoder power domain

            - description: G2 decoder power domain

            - description: H1 encoder power domain



        power-domain-names:

          items:

            - const: bus
@@ -38,8 +75,10 @@ properties: 
            - const: h1



        clocks:

    minItems: 3

    maxItems: 3

          items:

            - description: G1 decoder clk

            - description: G2 decoder clk

            - description: H1 encoder clk



        clock-names:

          items:
@@ -47,13 +86,62 @@ properties: 
            - const: g2

            - const: h1



required:

  - compatible

  - reg

  - power-domains

  - power-domain-names

  - clocks

  - clock-names

        interconnects:

          items:

            - description: G1 decoder interconnect

            - description: G2 decoder interconnect

            - description: H1 encoder power domain



        interconnect-names:

          items:

            - const: g1

            - const: g2

            - const: h1



  - if:

      properties:

        compatible:

          contains:

            const: fsl,imx8mp-vpu-blk-ctrl

    then:

      properties:

        power-domains:

          items:

            - description: bus power domain

            - description: G1 decoder power domain

            - description: G2 decoder power domain

            - description: VC8000E encoder power domain



        power-domain-names:

          items:

            - const: bus

            - const: g1

            - const: g2

            - const: vc8000e



        clocks:

          items:

            - description: G1 decoder clk

            - description: G2 decoder clk

            - description: VC8000E encoder clk



        clock-names:

          items:

            - const: g1

            - const: g2

            - const: vc8000e



        interconnects:

          items:

            - description: G1 decoder interconnect

            - description: G2 decoder interconnect

            - description: VC8000E encoder interconnect



        interconnect-names:

          items:

            - const: g1

            - const: g2

            - const: vc8000e



additionalProperties: false

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

+9 −0
Original line number Diff line number Diff line
@@ -52,6 +52,15 @@ properties: 
      - const: ref_266m

      - const: ref_24m



  interconnects:

    maxItems: 3



  interconnect-names:

    items:

      - const: hrv

      - const: lcdif-hdmi

      - const: hdcp



required:

  - compatible

  - reg

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

+10 −0
Original line number Diff line number Diff line
@@ -48,6 +48,16 @@ properties: 
      - const: usb

      - const: pcie



  interconnects:

    maxItems: 4



  interconnect-names:

    items:

      - const: noc-pcie

      - const: usb1

      - const: usb2

      - const: pcie



required:

  - compatible

  - reg