Commit 6f771ce6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX DT bindings update for 5.12:

- Various board compatible additions to fsl.yaml.
- Add vendor prefix for Plymovent and Kverneland Group.
- Update simple panel bindings to include compatible for EDT and Kyocera
  panels.

* tag 'imx-bindings-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  dt-bindings: arm: imx: add imx8mm nitrogen support
  dt-bindings: arm: fsl: Add the librem 5 Evergreen revision
  dt-bindings: arm: fsl: add Kverneland TGO board
  dt-bindings: arm: fsl: add Kverneland UT1, UT1Q and UI1P boards
  dt-bindings: vendor-prefixes: Add an entry for Kverneland Group
  dt-bindings: arm: fsl: add Kontron sl28 variant 1
  bindings: arm: fsl: Add PHYTEC i.MX8MP devicetree bindings
  dt-bindings: arm: fsl: add Protonic PRTI6G board
  dt-bindings: arm: fsl: add Protonic MVT board
  dt-bindings: arm: fsl: Add binding for Gateworks boards with IMX8MM
  dt-bindings: soc: imx8m: add DT Binding doc for soc unique ID
  dt-bindings: arm: fsl: add Plymovent BAS board
  dt-bindings: arm: fsl: add Plymovent M2M board
  dt-bindings: vendor-prefixes: Add an entry for Plymovent
  dt-bindings: display: simple: Add Kyocera tcg070wvlq panel
  dt-bindings: display: simple: add EDT compatibles already supported by the driver
  dt-bindings: display: simple: fix alphabetical order for EDT compatibles
  dt-bindings: arm: fsl: Add beacon,imx8mn-beacon-kit

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b7976dcf 1447e43c

Documentation/devicetree/bindings/arm/fsl.yaml

+23 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ properties: 
              - kiebackpeter,imx6q-tpc    # K+P i.MX6 Quad TPC Board

              - kontron,imx6q-samx6i      # Kontron i.MX6 Dual/Quad SMARC Module

              - kosagi,imx6q-novena       # Kosagi Novena Dual/Quad

              - kvg,vicut1q               # Kverneland UT1Q board

              - logicpd,imx6q-logicpd

              - lwn,display5              # Liebherr Display5 i.MX6 Quad Board

              - lwn,mccmon6               # Liebherr Monitor6 i.MX6 Quad Board
@@ -331,6 +332,7 @@ properties: 
              - fsl,imx6qp-sabreauto      # i.MX6 Quad Plus SABRE Automotive Board

              - fsl,imx6qp-sabresd        # i.MX6 Quad Plus SABRE Smart Device Board

              - karo,imx6qp-tx6qp         # Ka-Ro electronics TX6QP-8037 Module

              - kvg,vicutp                # Kverneland UT1P board

              - prt,prtwd3                # Protonic WD3 board

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

              - zii,imx6qp-zii-rdu2       # ZII RDU2+ Board
@@ -364,7 +366,12 @@ properties: 
              - fsl,imx6dl-sabresd        # i.MX6 DualLite SABRE Smart Device Board

              - karo,imx6dl-tx6dl         # Ka-Ro electronics TX6U Modules

              - kontron,imx6dl-samx6i     # Kontron i.MX6 Solo SMARC Module

              - kvg,victgo                # Kverneland TGO

              - kvg,vicut1                # Kverneland UT1 board

              - ply,plybas                # Plymovent BAS board

              - ply,plym2m                # Plymovent M2M board

              - poslab,imx6dl-savageboard # Poslab SavageBoard Dual

              - prt,prtmvt                # Protonic MVT board

              - prt,prtrvt                # Protonic RVT board

              - prt,prtvt7                # Protonic VT7 board

              - rex,imx6dl-rex-basic      # Rex Basic i.MX6 Dual Lite Board
@@ -488,6 +495,7 @@ properties: 
              - karo,imx6ul-tx6ul         # Ka-Ro electronics TXUL-0010 Module

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

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

              - prt,prti6g                # Protonic PRTI6G Board

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

              - technexion,imx6ul-pico-hobbit  # TechNexion i.MX6UL Pico-Hobbit

              - technexion,imx6ul-pico-pi      # TechNexion i.MX6UL Pico-Pi
@@ -670,8 +678,12 @@ properties: 
        items:

          - enum:

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

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

              - fsl,imx8mm-ddr4-evk       # i.MX8MM DDR4 EVK Board

              - fsl,imx8mm-evk            # i.MX8MM EVK Board

              - 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

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

              - variscite,var-som-mx8mm   # i.MX8MM Variscite VAR-SOM-MX8MM module

          - const: fsl,imx8mm
@@ -691,6 +703,7 @@ properties: 
      - description: i.MX8MN based Boards

        items:

          - enum:

              - beacon,imx8mn-beacon-kit  # i.MX8MN Beacon Development Kit

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

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

          - const: fsl,imx8mn
@@ -707,6 +720,12 @@ properties: 
              - fsl,imx8mp-evk            # i.MX8MP EVK Board

          - const: fsl,imx8mp



      - description: PHYTEC phyCORE-i.MX8MP SoM based boards

        items:

          - const: phytec,imx8mp-phyboard-pollux-rdk # phyBOARD-Pollux RDK

          - const: phytec,imx8mp-phycore-som         # phyCORE-i.MX8MP SoM

          - const: fsl,imx8mp



      - description: i.MX8MQ based Boards

        items:

          - enum:
@@ -724,6 +743,7 @@ properties: 
          - enum:

              - purism,librem5r2          # Purism Librem5 phone "Chestnut"

              - purism,librem5r3          # Purism Librem5 phone "Dogwood"

              - purism,librem5r4          # Purism Librem5 phone "Evergreen"

          - const: purism,librem5

          - const: fsl,imx8mq
@@ -834,10 +854,12 @@ properties: 
          Kontron SMARC-sAL28 board on the SMARC Eval Carrier 2.0

        items:

          - enum:

              - kontron,sl28-var1-ads2

              - kontron,sl28-var2-ads2

              - kontron,sl28-var3-ads2

              - kontron,sl28-var4-ads2

          - enum:

              - kontron,sl28-var1

              - kontron,sl28-var2

              - kontron,sl28-var3

              - kontron,sl28-var4
@@ -848,6 +870,7 @@ properties: 
          Kontron SMARC-sAL28 board (on a generic/undefined carrier)

        items:

          - enum:

              - kontron,sl28-var1

              - kontron,sl28-var2

              - kontron,sl28-var3

              - kontron,sl28-var4

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+11 −8
Original line number Diff line number Diff line
@@ -105,26 +105,27 @@ properties: 
      - dlc,dlc1010gig

        # Emerging Display Technology Corp. 3.5" QVGA TFT LCD panel

      - edt,et035012dm6

        # Emerging Display Technology Corp. 5.7" VGA TFT LCD panel

      - edt,et057090dhu

      - edt,et070080dh6

        # Emerging Display Technology Corp. 480x272 TFT Display with capacitive touch

      - edt,etm043080dh6gp

        # Emerging Display Technology Corp. 480x272 TFT Display

      - edt,etm0430g0dh6

        # Emerging Display Technology Corp. 5.7" VGA TFT LCD panel

      - edt,et057090dhu

        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

      - edt,etm070080dh6

        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

      - edt,etm0700g0dh6

        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

        # Same as ETM0700G0DH6 but with inverted pixel clock.

      - edt,etm070080bdh6

        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

        # Same timings as the ETM0700G0DH6, but with resistive touch.

      - edt,etm070080dh6

        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

        # Same display as the ETM0700G0BDH6, but with changed hardware for the

        # backlight and the touch interface.

      - edt,etm070080edh6

      - edt,etm0700g0bdh6

        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

        # Same timings as the ETM0700G0DH6, but with resistive touch.

      - edt,etm070080dh6

      - edt,etm0700g0dh6

      - edt,etm0700g0edh6

        # Evervision Electronics Co. Ltd. VGG804821 5.0" WVGA TFT LCD Panel

      - evervision,vgg804821

        # Foxlink Group 5" WVGA TFT LCD panel
@@ -173,6 +174,8 @@ properties: 
      - koe,tx26d202vm0bwa

        # Kaohsiung Opto-Electronics. TX31D200VM0BAA 12.3" HSXGA LVDS panel

      - koe,tx31d200vm0baa

        # Kyocera Corporation 7" WVGA (800x480) transmissive color TFT

      - kyo,tcg070wvlq

        # Kyocera Corporation 12.1" XGA (1024x768) TFT LCD panel

      - kyo,tcg121xglp

        # LeMaker BL035-RGB-002 3.5" QVGA TFT LCD panel

Documentation/devicetree/bindings/soc/imx/imx8m-soc.yaml

0 → 100644
+86 −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/imx8m-soc.yaml#

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



title: NXP i.MX8M Series SoC



maintainers:

  - Alice Guo <alice.guo@nxp.com>



description: |

  NXP i.MX8M series SoCs contain fuse entries from which SoC Unique ID can be

  obtained.



select:

  properties:

    compatible:

      contains:

        enum:

          - fsl,imx8mm

          - fsl,imx8mn

          - fsl,imx8mp

          - fsl,imx8mq

  required:

    - compatible



patternProperties:

  "^soc@[0-9a-f]+$":

    type: object

    properties:

      compatible:

        items:

          - enum:

              - fsl,imx8mm-soc

              - fsl,imx8mn-soc

              - fsl,imx8mp-soc

              - fsl,imx8mq-soc

          - const: simple-bus



      "#address-cells":

        const: 1



      "#size-cells":

        const: 1



      ranges: true



      dma-ranges: true



      nvmem-cells:

        maxItems: 1

        description: Phandle to the SOC Unique ID provided by a nvmem node



      nvmem-cell-names:

        const: soc_unique_id



    required:

      - compatible

      - nvmem-cells

      - nvmem-cell-names



    additionalProperties:

      type: object



additionalProperties: true



examples:

  - |

    / {

        model = "FSL i.MX8MM EVK board";

        compatible = "fsl,imx8mm-evk", "fsl,imx8mm";

        #address-cells = <2>;

        #size-cells = <2>;



        soc@0 {

            compatible = "fsl,imx8mm-soc", "simple-bus";

            #address-cells = <1>;

            #size-cells = <1>;

            ranges = <0x0 0x0 0x0 0x3e000000>;

            nvmem-cells = <&imx8mm_uid>;

            nvmem-cell-names = "soc_unique_id";

        };

    };



...

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ patternProperties: 
    description: Kontron S&T AG

  "^kosagi,.*":

    description: Sutajio Ko-Usagi PTE Ltd.

  "^kvg,.*":

    description: Kverneland Group

  "^kyo,.*":

    description: Kyocera Corporation

  "^lacie,.*":
@@ -868,6 +870,8 @@ patternProperties: 
    description: PLDA

  "^plx,.*":

    description: Broadcom Corporation (formerly PLX Technology)

  "^ply,.*":

    description: Plymovent Group BV

  "^pni,.*":

    description: PNI Sensor Corporation

  "^pocketbook,.*":