Unverified Commit 9018001e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX dt-bindings update for 5.17:

- New bindings for i.MX SPBA bus and i.MX8MN DISP blk-ctrl.
- New vendor prefix for BSH Hausgeraete GmbH and JOZ BV.
- New compatibles for various i.MX6 and i.MX8 boards.
- Add optional 'fsl,continuous-burst-clk' property support for imx-weim
  binding.

* tag 'imx-bindings-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: soc: add binding for i.MX8MN DISP blk-ctrl
  dt-bindings: arm: fsl: Add BSH SMM-M2 IMX6ULZ SystemMaster board
  dt-bindings: arm: fsl: Add iMX8MN BSH SMM S2 boards
  dt-bindings: Add vendor prefix for BSH Hausgeraete GmbH
  dt-bindings: soc: imx: Add binding doc for spba bus
  dt-bindings: bus: imx-weim: add words about continuous bclk
  dt-bindings: arm: fsl: add TQMa8Mx boards
  dt-bindings: arm: fsl: add TQMa8MxNL boards
  dt-bindings: arm: fsl: add TQMa8MxML boards
  dt-bindings: arm: fsl: Add binding for imx8ulp evk
  dt-bindings: arm: fsl: Add Y Soft IOTA Crux/Crux+ boards
  dt-bindings: arm: fsl: add TQ-Systems boards based on i.MX6Q/QP/DL
  dt-bindings: arm: fsl: add JOZ Access Point
  dt-bindings: vendor-prefixes: Add an entry for JOZ BV

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8a3804c0 e1e06edd

Documentation/devicetree/bindings/arm/fsl.yaml

+78 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ properties: 
              - uniwest,imx6q-evi         # Uniwest Evi

              - variscite,dt6customboard

              - wand,imx6q-wandboard      # Wandboard i.MX6 Quad Board

              - ysoft,imx6q-yapp4-crux    # i.MX6 Quad Y Soft IOTA Crux board

              - zealz,imx6q-gk802         # Zealz GK802

              - zii,imx6q-zii-rdu2        # ZII RDU2 Board

          - const: fsl,imx6q
@@ -323,6 +324,20 @@ properties: 
          - const: toradex,apalis_imx6q

          - const: fsl,imx6q



      - description: TQ-Systems TQMa6Q SoM (variant A) on MBa6x

        items:

          - const: tq,imx6q-mba6x-a

          - const: tq,mba6a               # Expected by bootloader, to be removed in the future

          - const: tq,imx6q-tqma6q-a

          - const: fsl,imx6q



      - description: TQ-Systems TQMa6Q SoM (variant B) on MBa6x

        items:

          - const: tq,imx6q-mba6x-b

          - const: tq,mba6b               # Expected by bootloader, to be removed in the future

          - const: tq,imx6q-tqma6q-b

          - const: fsl,imx6q



      - description: i.MX6QP based Boards

        items:

          - enum:
@@ -334,6 +349,7 @@ properties: 
              - kvg,vicutp                # Kverneland UT1P board

              - prt,prtwd3                # Protonic WD3 board

              - wand,imx6qp-wandboard     # Wandboard i.MX6 QuadPlus Board

              - ysoft,imx6qp-yapp4-crux-plus  # i.MX6 Quad Plus Y Soft IOTA Crux+ board

              - zii,imx6qp-zii-rdu2       # ZII RDU2+ Board

          - const: fsl,imx6qp
@@ -344,6 +360,13 @@ properties: 
          - const: phytec,imx6qdl-pcm058  # PHYTEC phyCORE-i.MX6

          - const: fsl,imx6qp



      - description: TQ-Systems TQMa6QP SoM on MBa6x

        items:

          - const: tq,imx6qp-mba6x-b

          - const: tq,mba6b               # Expected by bootloader, to be removed in the future

          - const: tq,imx6qp-tqma6qp-b

          - const: fsl,imx6qp



      - description: i.MX6DL based Boards

        items:

          - enum:
@@ -482,6 +505,20 @@ properties: 
          - const: dh,imx6s-dhcom-som

          - const: fsl,imx6dl



      - description: TQ-Systems TQMa6DL SoM (variant A) on MBa6x

        items:

          - const: tq,imx6dl-mba6x-a

          - const: tq,mba6a               # Expected by bootloader, to be removed in the future

          - const: tq,imx6dl-tqma6dl-a

          - const: fsl,imx6dl



      - description: TQ-Systems TQMa6DL SoM (variant B) on MBa6x

        items:

          - const: tq,imx6dl-mba6x-b

          - const: tq,mba6b               # Expected by bootloader, to be removed in the future

          - const: tq,imx6dl-tqma6dl-b

          - const: fsl,imx6dl



      - description: i.MX6SL based Boards

        items:

          - enum:
@@ -580,6 +617,7 @@ properties: 
        items:

          - enum:

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

              - joz,jozacp                # JOZ Access Point

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

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

              - toradex,colibri-imx6ull      # Colibri iMX6ULL Modules
@@ -632,6 +670,7 @@ properties: 
      - description: i.MX6ULZ based Boards

        items:

          - enum:

              - bsh,imx6ulz-bsh-smm-m2    # i.MX6 ULZ BSH SystemMaster

              - fsl,imx6ulz-14x14-evk     # i.MX6 ULZ 14x14 EVK Board

          - const: fsl,imx6ull # This seems odd. Should be last?

          - const: fsl,imx6ulz
@@ -754,10 +793,23 @@ properties: 
          - const: variscite,var-som-mx8mm

          - const: fsl,imx8mm



      - description:

          TQMa8MxML is a series of SOM featuring NXP i.MX8MM system-on-chip

          variants. It is designed to be soldered on different carrier boards.

          All variants (TQMa8M[Q,D,S][L]ML) use the same device tree, hence only

          one compatible is needed.

        items:

          - enum:

              - 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



      - description: i.MX8MN based Boards

        items:

          - enum:

              - 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-ddr4-evk       # i.MX8MN DDR4 EVK Board

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

              - gw,imx8mn-gw7902          # i.MX8MM Gateworks Board
@@ -769,6 +821,17 @@ properties: 
          - const: variscite,var-som-mx8mn

          - const: fsl,imx8mn



      - description:

          TQMa8MxNL is a series of SOM featuring NXP i.MX8MN system-on-chip

          variants. It is designed to be soldered on different carrier boards.

          All variants (TQMa8M[Q,D,S][L]NL) use the same device tree, hence only

          one compatible is needed.

        items:

          - enum:

              - tq,imx8mn-tqma8mqnl-mba8mx # TQ-Systems GmbH i.MX8MN TQMa8MQNL SOM on MBa8Mx

          - const: tq,imx8mn-tqma8mqnl     # TQ-Systems GmbH i.MX8MN TQMa8MQNL SOM

          - const: fsl,imx8mn



      - description: i.MX8MP based Boards

        items:

          - enum:
@@ -805,6 +868,15 @@ properties: 
          - const: purism,librem5

          - const: fsl,imx8mq



      - description:

          TQMa8Mx is a series of SOM featuring NXP i.MX8MQ system-on-chip

          variants. It is designed to be clicked on different carrier boards.

        items:

          - enum:

              - tq,imx8mq-tqma8mq-mba8mx # TQ-Systems GmbH i.MX8MQ TQMa8Mx SOM on MBa8Mx

          - const: tq,imx8mq-tqma8mq     # TQ-Systems GmbH i.MX8MQ TQMa8Mx SOM

          - const: fsl,imx8mq



      - description: Zodiac Inflight Innovations Ultra Boards

        items:

          - enum:
@@ -834,6 +906,12 @@ properties: 
          - const: toradex,colibri-imx8x

          - const: fsl,imx8qxp



      - description: i.MX8ULP based Boards

        items:

          - enum:

              - fsl,imx8ulp-evk           # i.MX8ULP EVK Board

          - const: fsl,imx8ulp



      - description:

          Freescale Vybrid Platform Device Tree Bindings

Documentation/devicetree/bindings/bus/fsl,spba-bus.yaml

0 → 100644
+68 −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/bus/fsl,spba-bus.yaml#

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



title: Shared Peripherals Bus Interface



maintainers:

  - Shawn Guo <shawnguo@kernel.org>



description: |

  A simple bus enabling access to shared peripherals.



  The "spba-bus" follows the "simple-bus" set of properties, as

  specified in the Devicetree Specification.  It is an extension of

  "simple-bus" because the SDMA controller uses this compatible flag to

  determine which peripherals are available to it and the range over which

  the SDMA can access.  There are no special clocks for the bus, because

  the SDMA controller itself has its interrupt and clock assignments.



select:

  properties:

    compatible:

      contains:

        const: fsl,spba-bus

  required:

    - compatible



properties:

  $nodename:

    pattern: "^spba-bus(@[0-9a-f]+)?$"



  compatible:

    items:

      - const: fsl,spba-bus

      - const: simple-bus



  '#address-cells':

    enum: [ 1, 2 ]



  '#size-cells':

    enum: [ 1, 2 ]



  reg:

    maxItems: 1



  ranges: true



required:

  - compatible

  - '#address-cells'

  - '#size-cells'

  - reg

  - ranges



additionalProperties:

  type: object



examples:

  - |

    spba-bus@30000000 {

        compatible = "fsl,spba-bus", "simple-bus";

        #address-cells = <1>;

        #size-cells = <1>;

        reg = <0x30000000 0x100000>;

        ranges;

    };

Documentation/devicetree/bindings/bus/imx-weim.txt

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ Optional properties: 
			devices, the presence of this property indicates that

			the weim bus should operate in Burst Clock Mode.



 - fsl,continuous-burst-clk	Make Burst Clock to output continuous clock.

			Without this option Burst Clock will output clock

			only when necessary. This takes effect only if

			"fsl,burst-clk-enable" is set.



Timing property for child nodes. It is mandatory, not optional.



 - fsl,weim-cs-timing:	The timing array, contains timing values for the

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

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

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



title: NXP i.MX8MN DISP blk-ctrl



maintainers:

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



description:

  The i.MX8MN 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,imx8mn-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: isi

      - const: lcdif

      - const: mipi-dsi

      - const: mipi-csi



  clocks:

    minItems: 11

    maxItems: 11



  clock-names:

    items:

      - const: disp_axi

      - const: disp_apb

      - const: disp_axi_root

      - const: disp_apb_root

      - 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/imx8mn-clock.h>

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



    disp_blk_ctl: blk_ctrl@32e28000 {

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

      reg = <0x32e28000 0x100>;

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

                      <&pgc_dispmix>, <&pgc_mipi>,

                      <&pgc_mipi>;

      power-domain-names = "bus", "isi", "lcdif", "mipi-dsi",

                           "mipi-csi";

      clocks = <&clk IMX8MN_CLK_DISP_AXI>,

               <&clk IMX8MN_CLK_DISP_APB>,

               <&clk IMX8MN_CLK_DISP_AXI_ROOT>,

               <&clk IMX8MN_CLK_DISP_APB_ROOT>,

               <&clk IMX8MN_CLK_DISP_AXI_ROOT>,

               <&clk IMX8MN_CLK_DISP_APB_ROOT>,

               <&clk IMX8MN_CLK_DISP_PIXEL_ROOT>,

               <&clk IMX8MN_CLK_DSI_CORE>,

               <&clk IMX8MN_CLK_DSI_PHY_REF>,

               <&clk IMX8MN_CLK_CSI1_PHY_REF>,

               <&clk IMX8MN_CLK_CAMERA_PIXEL_ROOT>;

       clock-names = "disp_axi", "disp_apb", "disp_axi_root", "disp_apb_root",

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

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

       #power-domain-cells = <1>;

    };

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ patternProperties: 
    description: Shanghai Broadmobi Communication Technology Co.,Ltd.

  "^brcm,.*":

    description: Broadcom Corporation

  "^bsh,.*":

    description: BSH Hausgeraete GmbH

  "^buffalo,.*":

    description: Buffalo, Inc.

  "^bur,.*":
@@ -593,6 +595,8 @@ patternProperties: 
    description: JetHome (IP Sokolov P.A.)

  "^jianda,.*":

    description: Jiandangjing Technology Co., Ltd.

  "^joz,.*":

    description: JOZ BV

  "^kam,.*":

    description: Kamstrup A/S

  "^karo,.*":