Unverified Commit 353bbb3d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX DT bindings update for 5.16:

- Various board compatible addition: NXP S32G2, LS1021A TSN, Toradex
  Colibri i.MX6ULL, LX2160A BlueBox 3 boards.
- Toradex board and module compatibles clean-up.
- Convert fsl-linflexuart bindings to json-schema format and add S32G2
  compatible.
- Add bindings and defines for i.MX8MM VPU and DISP blk-ctrl.

* tag 'imx-bindings-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: arm: fsl: add ls1021a-tsn board
  dt-bindings: power: imx8mm: add defines for DISP blk-ctrl domains
  dt-bindings: soc: add binding for i.MX8MM DISP blk-ctrl
  dt-bindings: power: imx8mm: add defines for VPU blk-ctrl domains
  dt-bindings: soc: add binding for i.MX8MM VPU blk-ctrl
  dt-bindings: arm: fsl: Add E70K02 based ebook readers
  dt-bindings: arm: fsl: add toradex,colibri-imx6ull-emmc
  dt-bindings: arm: fsl: clean-up all toradex boards/modules
  dt-bindings: serial: fsl-linflexuart: add compatible for S32G2
  dt-bindings: serial: fsl-linflexuart: convert to json-schema format
  dt-bindings: arm: fsl: add NXP S32G2 boards
  dt-bindings: arm: fsl: document the LX2160A BlueBox 3 boards

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 06ddf8fb 83ad8d10

Documentation/devicetree/bindings/arm/fsl.yaml

+61 −38
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ properties: 
              - technexion,imx6q-pico-pi      # TechNexion i.MX6Q Pico-Pi

              - technologic,imx6q-ts4900

              - technologic,imx6q-ts7970

              - toradex,apalis_imx6q      # Apalis iMX6 Module

              - toradex,apalis_imx6q      # Apalis iMX6 Modules

              - udoo,imx6q-udoo           # Udoo i.MX6 Quad Board

              - uniwest,imx6q-evi         # Uniwest Evi

              - variscite,dt6customboard
@@ -314,21 +314,15 @@ properties: 
          - const: phytec,imx6q-pfla02    # PHYTEC phyFLEX-i.MX6 Quad

          - const: fsl,imx6q



      - description: i.MX6Q Boards with Toradex Apalis iMX6Q/D Module

      - description: i.MX6Q Boards with Toradex Apalis iMX6Q/D Modules

        items:

          - enum:

              - toradex,apalis_imx6q-ixora      # Apalis iMX6Q/D Module on Ixora Carrier Board

              - toradex,apalis_imx6q-ixora-v1.1 # Apalis iMX6Q/D Module on Ixora V1.1 Carrier Board

              - toradex,apalis_imx6q-eval       # Apalis iMX6Q/D Module on Apalis Evaluation Board

          - const: toradex,apalis_imx6q

          - const: fsl,imx6q



      - description: i.MX6Q Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.1

        items:

          - const: toradex,apalis_imx6q-ixora-v1.1

          - const: toradex,apalis_imx6q-ixora

          - const: toradex,apalis_imx6q

          - const: fsl,imx6q



      - description: i.MX6QP based Boards

        items:

          - enum:
@@ -393,6 +387,8 @@ properties: 
              - technexion,imx6dl-pico-pi      # TechNexion i.MX6DL Pico-Pi

              - 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
@@ -466,20 +462,18 @@ properties: 
          - const: phytec,imx6dl-pfla02   # PHYTEC phyFLEX-i.MX6 Quad

          - const: fsl,imx6dl



      - description: i.MX6DL Toradex Colibri iMX6 Module on Colibri

                     Evaluation Board V3

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

        items:

          - const: toradex,colibri_imx6dl-eval-v3

          - const: toradex,colibri_imx6dl          # Colibri iMX6 Module

          - enum:

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

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

          - const: fsl,imx6dl



      - description: i.MX6DL Toradex Colibri iMX6 Module V1.1 on Colibri

                     Evaluation Board V3

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

        items:

          - const: toradex,colibri_imx6dl-v1_1-eval-v3

          - const: toradex,colibri_imx6dl-v1_1     # Colibri iMX6 Module V1.1

          - const: toradex,colibri_imx6dl-eval-v3

          - const: toradex,colibri_imx6dl          # Colibri iMX6 Module

          - 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
@@ -494,6 +488,7 @@ properties: 
              - fsl,imx6sl-evk            # i.MX6 SoloLite EVK Board

              - kobo,tolino-shine2hd

              - kobo,tolino-shine3

              - kobo,tolino-vision5

              - revotics,imx6sl-warp      # Revotics WaRP Board

          - const: fsl,imx6sl
@@ -502,6 +497,7 @@ properties: 
          - enum:

              - fsl,imx6sll-evk

              - kobo,clarahd

              - kobo,librah2o

          - const: fsl,imx6sll



      - description: i.MX6SX based Boards
@@ -586,8 +582,9 @@ properties: 
              - fsl,imx6ull-14x14-evk     # i.MX6 UltraLiteLite 14x14 EVK Board

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

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

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

              - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board

              - toradex,colibri-imx6ull      # Colibri iMX6ULL Modules

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

              - toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi / BT Modules

          - const: fsl,imx6ull



      - description: i.MX6ULL Armadeus Systems OPOS6ULDev Board
@@ -605,6 +602,27 @@ properties: 
          - 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

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

          - const: fsl,imx6dl



      - 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

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

          - const: fsl,imx6dl



      - 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

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

          - const: fsl,imx6dl



      - description: Kontron N6411 S Board

        items:

          - const: kontron,imx6ull-n6411-s
@@ -622,6 +640,7 @@ properties: 
        items:

          - enum:

              - element14,imx7s-warp      # Element14 Warp i.MX7 Board

              - toradex,colibri-imx7s     # Colibri iMX7S Module

          - const: fsl,imx7s



      - description: i.MX7S Boards with Toradex Colibri iMX7S Module
@@ -653,15 +672,8 @@ properties: 
              - technexion,imx7d-pico-hobbit  # TechNexion i.MX7D Pico-Hobbit

              - technexion,imx7d-pico-nymph   # TechNexion i.MX7D Pico-Nymph

              - technexion,imx7d-pico-pi      # TechNexion i.MX7D Pico-Pi

              - toradex,colibri-imx7d                   # Colibri iMX7 Dual Module

              - toradex,colibri-imx7d-aster             # Colibri iMX7 Dual Module on Aster Carrier Board

              - toradex,colibri-imx7d-emmc              # Colibri iMX7 Dual 1GB (eMMC) Module

              - toradex,colibri-imx7d-emmc-aster        # Colibri iMX7 Dual 1GB (eMMC) Module on

                                                        #  Aster Carrier Board

              - toradex,colibri-imx7d-emmc-eval-v3      # Colibri iMX7 Dual 1GB (eMMC) Module on

                                                        #  Colibri Evaluation Board V3

              - toradex,colibri-imx7d-eval-v3           # Colibri iMX7 Dual Module on

                                                        #  Colibri Evaluation Board V3

              - toradex,colibri-imx7d         # Colibri iMX7D Module

              - toradex,colibri-imx7d-emmc    # Colibri iMX7D 1GB (eMMC) Module

              - zii,imx7d-rmu2            # ZII RMU2 Board

              - zii,imx7d-rpu2            # ZII RPU2 Board

          - const: fsl,imx7d
@@ -686,12 +698,12 @@ properties: 
      - description: i.MX7D Boards with Toradex Colibri i.MX7D Module

        items:

          - enum:

              - toradex,colibri-imx7d-aster   # Module on Aster Carrier Board

              - toradex,colibri-imx7d-eval-v3 # Module on Colibri Evaluation Board V3

              - toradex,colibri-imx7d-aster   # Colibri iMX7D Module on Aster Carrier Board

              - toradex,colibri-imx7d-eval-v3 # Colibri iMX7D Module on Colibri Evaluation Board V3

          - const: toradex,colibri-imx7d

          - const: fsl,imx7d



      - description: i.MX7D Boards with Toradex Colibri i.MX7D eMMC Module

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

        items:

          - enum:

              - toradex,colibri-imx7d-emmc-aster    # Module on Aster Carrier Board
@@ -812,10 +824,10 @@ properties: 
          - enum:

              - einfochips,imx8qxp-ai_ml  # i.MX8QXP AI_ML Board

              - fsl,imx8qxp-mek           # i.MX8QXP MEK Board

              - toradex,colibri-imx8x         # Colibri iMX8X Module

              - toradex,colibri-imx8x     # Colibri iMX8X Modules

          - const: fsl,imx8qxp



      - description: Toradex Colibri i.MX8 Evaluation Board

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

        items:

          - enum:

              - toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
@@ -847,9 +859,10 @@ properties: 
      - description: VF610 based Boards

        items:

          - enum:

              - fsl,vf610-twr             # VF610 Tower Board

              - lwn,bk4                   # Liebherr BK4 controller

              - phytec,vf610-cosmic       # PHYTEC Cosmic/Cosmic+ Board

              - fsl,vf610-twr             # VF610 Tower Board

              - toradex,vf610-colibri_vf61 # Colibri VF61 Modules

          - const: fsl,vf610



      - description: Toradex Colibri VF61 Module on Colibri Evaluation Board
@@ -886,6 +899,7 @@ properties: 
          - enum:

              - fsl,ls1021a-moxa-uc-8410a

              - fsl,ls1021a-qds

              - fsl,ls1021a-tsn

              - fsl,ls1021a-twr

          - const: fsl,ls1021a
@@ -977,6 +991,8 @@ properties: 
      - description: LX2160A based Boards

        items:

          - enum:

              - fsl,lx2160a-bluebox3

              - fsl,lx2160a-bluebox3-rev-a

              - fsl,lx2160a-qds

              - fsl,lx2160a-rdb

              - fsl,lx2162a-qds
@@ -990,6 +1006,13 @@ properties: 
          - const: solidrun,lx2160a-cex7

          - const: fsl,lx2160a



      - description: S32G2 based Boards

        items:

          - enum:

              - nxp,s32g274a-evb

              - nxp,s32g274a-rdb2

          - const: nxp,s32g2



      - description: S32V234 based Boards

        items:

          - enum:

Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.txt

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
* Freescale LINFlexD UART



The LINFlexD controller implements several LIN protocol versions, as well as

support for full-duplex UART communication through 8-bit and 9-bit frames.



See chapter 47 ("LINFlexD") in the reference manual[1].



Required properties:

- compatible :

  - "fsl,s32v234-linflexuart" for LINFlexD configured in UART mode, which

    is compatible with the one integrated on S32V234 SoC

- reg : Address and length of the register set for the device

- interrupts : Should contain uart interrupt



Example:

uart0: serial@40053000 {

	compatible = "fsl,s32v234-linflexuart";

	reg = <0x0 0x40053000 0x0 0x1000>;

	interrupts = <0 59 4>;

};



[1] https://www.nxp.com/webapp/Download?colCode=S32V234RM

Documentation/devicetree/bindings/serial/fsl,s32-linflexuart.yaml

0 → 100644
+48 −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/serial/fsl,s32-linflexuart.yaml#

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



title: Freescale LINFlexD UART



description: |

  The LINFlexD controller implements several LIN protocol versions, as well

  as support for full-duplex UART communication through 8-bit and 9-bit

  frames. See chapter 47 ("LINFlexD") in the reference manual

  https://www.nxp.com/webapp/Download?colCode=S32V234RM.



maintainers:

  - Chester Lin <clin@suse.com>



allOf:

  - $ref: "serial.yaml"



properties:

  compatible:

    oneOf:

      - const: fsl,s32v234-linflexuart

      - items:

          - const: nxp,s32g2-linflexuart

          - const: fsl,s32v234-linflexuart



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



unevaluatedProperties: false



examples:

  - |

    serial@40053000 {

        compatible = "fsl,s32v234-linflexuart";

        reg = <0x40053000 0x1000>;

        interrupts = <0 59 4>;

    };

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

0 → 100644
+94 −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,imx8mm-disp-blk-ctrl.yaml#

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



title: NXP i.MX8MM DISP blk-ctrl



maintainers:

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



description:

  The i.MX8MM DISP blk-ctrl is a top-level peripheral providing access to

  the NoC and ensuring proper power sequencing of the display and MIPI CSI

  peripherals located in the DISP domain of the SoC.



properties:

  compatible:

    items:

      - const: fsl,imx8mm-disp-blk-ctrl

      - const: syscon



  reg:

    maxItems: 1



  '#power-domain-cells':

    const: 1



  power-domains:

    minItems: 5

    maxItems: 5



  power-domain-names:

    items:

      - const: bus

      - const: csi-bridge

      - const: lcdif

      - const: mipi-dsi

      - const: mipi-csi



  clocks:

    minItems: 10

    maxItems: 10



  clock-names:

    items:

      - const: csi-bridge-axi

      - const: csi-bridge-apb

      - const: csi-bridge-core

      - const: lcdif-axi

      - const: lcdif-apb

      - const: lcdif-pix

      - const: dsi-pclk

      - const: dsi-ref

      - const: csi-aclk

      - const: csi-pclk



required:

  - compatible

  - reg

  - power-domains

  - power-domain-names

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

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

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



    disp_blk_ctl: blk_ctrl@32e28000 {

      compatible = "fsl,imx8mm-disp-blk-ctrl", "syscon";

      reg = <0x32e28000 0x100>;

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

                      <&pgc_mipi>, <&pgc_mipi>;

      power-domain-names = "bus", "csi-bridge", "lcdif",

                           "mipi-dsi", "mipi-csi";

      clocks = <&clk IMX8MM_CLK_DISP_AXI_ROOT>,

               <&clk IMX8MM_CLK_DISP_APB_ROOT>,

               <&clk IMX8MM_CLK_CSI1_ROOT>,

               <&clk IMX8MM_CLK_DISP_AXI_ROOT>,

               <&clk IMX8MM_CLK_DISP_APB_ROOT>,

               <&clk IMX8MM_CLK_DISP_ROOT>,

               <&clk IMX8MM_CLK_DSI_CORE>,

               <&clk IMX8MM_CLK_DSI_PHY_REF>,

               <&clk IMX8MM_CLK_CSI1_CORE>,

               <&clk IMX8MM_CLK_CSI1_PHY_REF>;

       clock-names = "csi-bridge-axi", "csi-bridge-apb", "csi-bridge-core",

                     "lcdif-axi", "lcdif-apb", "lcdif-pix", "dsi-pclk",

                     "dsi-ref", "csi-aclk", "csi-pclk";

       #power-domain-cells = <1>;

    };

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

0 → 100644
+76 −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,imx8mm-vpu-blk-ctrl.yaml#

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



title: NXP i.MX8MM VPU blk-ctrl



maintainers:

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



description:

  The i.MX8MM VPU blk-ctrl is a top-level peripheral providing access to

  the NoC and ensuring proper power sequencing of the VPU peripherals

  located in the VPU domain of the SoC.



properties:

  compatible:

    items:

      - const: fsl,imx8mm-vpu-blk-ctrl

      - const: syscon



  reg:

    maxItems: 1



  '#power-domain-cells':

    const: 1



  power-domains:

    minItems: 4

    maxItems: 4



  power-domain-names:

    items:

      - const: bus

      - const: g1

      - const: g2

      - const: h1



  clocks:

    minItems: 3

    maxItems: 3



  clock-names:

    items:

      - const: g1

      - const: g2

      - const: h1



required:

  - compatible

  - reg

  - power-domains

  - power-domain-names

  - clocks

  - clock-names



additionalProperties: false



examples:

  - |

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

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



    vpu_blk_ctrl: blk-ctrl@38330000 {

      compatible = "fsl,imx8mm-vpu-blk-ctrl", "syscon";

      reg = <0x38330000 0x100>;

      power-domains = <&pgc_vpumix>, <&pgc_vpu_g1>,

                      <&pgc_vpu_g2>, <&pgc_vpu_h1>;

      power-domain-names = "bus", "g1", "g2", "h1";

      clocks = <&clk IMX8MM_CLK_VPU_G1_ROOT>,

               <&clk IMX8MM_CLK_VPU_G2_ROOT>,

               <&clk IMX8MM_CLK_VPU_H1_ROOT>;

      clock-names = "g1", "g2", "h1";

      #power-domain-cells = <1>;

    };