Commit b258ad99 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt-bindings-for-v5.1' of...

Merge tag 'renesas-dt-bindings-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/dt

Renesas ARM Based SoC DT Bindings Updates for v5.1

* Convert Renesas board/soc bindings to json-schema
* Correct SoC missmpatch for R-Car H2 (r8a7790) based Stout board
* Document RZ/A2M (r7s9210) based EVB
* Document RZ/G2E (r8a774c0) based cat87[45] boards

* tag 'renesas-dt-bindings-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  dt-bindings: arm: renesas: Fix SoC mismatch for Stout
  dt-bindings: arm: renesas: Document RZ/A2M EVB
  dt-bindings: arm: renesas: Add si-linux cat87[45] boards
  dt-bindings: arm: Convert Renesas board/soc bindings to json-schema

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0419a75b c051dc5e
Loading
Loading
Loading
Loading
+238 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/shmobile.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings

maintainers:
  - Geert Uytterhoeven <geert+renesas@glider.be>

properties:
  $nodename:
    const: '/'
  compatible:
    oneOf:
      - description: Emma Mobile EV2
        items:
          - enum:
              - renesas,kzm9d # Kyoto Microcomputer Co. KZM-A9-Dual
          - const: renesas,emev2

      - description: RZ/A1H (R7S72100)
        items:
          - enum:
              - renesas,genmai # Genmai (RTK772100BC00000BR)
              - renesas,gr-peach # GR-Peach (X28A-M01-E/F)
              - renesas,rskrza1 # RSKRZA1 (YR0K77210C000BE)
          - const: renesas,r7s72100

      - description: RZ/A2 (R7S9210)
        items:
          - enum:
              - renesas,rza2mevb # RZ/A2M Eval Board (RTK7921053S00000BE)
          - const: renesas,r7s9210

      - description: SH-Mobile AG5 (R8A73A00/SH73A0)
        items:
          - enum:
              - renesas,kzm9g # Kyoto Microcomputer Co. KZM-A9-GT
          - const: renesas,sh73a0

      - description: R-Mobile APE6 (R8A73A40)
        items:
          - enum:
              - renesas,ape6evm
          - const: renesas,r8a73a4

      - description: R-Mobile A1 (R8A77400)
        items:
          - enum:
              - renesas,armadillo800eva # Atmark Techno Armadillo-800 EVA
          - const: renesas,r8a7740

      - description: RZ/G1H (R8A77420)
        items:
          - const: renesas,r8a7742

      - description: RZ/G1M (R8A77430)
        items:
          - enum:
              # iWave Systems RZ/G1M Qseven Development Platform (iW-RainboW-G20D-Qseven)
              - iwave,g20d
          - const: iwave,g20m
          - const: renesas,r8a7743

      - items:
          - enum:
              # iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven)
              - iwave,g20m
              - renesas,sk-rzg1m # SK-RZG1M (YR8A77430S000BE)
          - const: renesas,r8a7743

      - description: RZ/G1N (R8A77440)
        items:
          - enum:
              # iWave Systems RZ/G1N Qseven Development Platform (iW-RainboW-G20D-Qseven)
              - iwave,g20d
          - const: iwave,g20m
          - const: renesas,r8a7744

      - items:
          - enum:
              # iWave Systems RZ/G1N Qseven System On Module (iW-RainboW-G20M-Qseven)
              - iwave,g20m
          - const: renesas,r8a7744

      - description: RZ/G1E (R8A77450)
        items:
          - enum:
              - iwave,g22m # iWave Systems RZ/G1E SODIMM System On Module (iW-RainboW-G22M-SM)
              - renesas,sk-rzg1e # SK-RZG1E (YR8A77450S000BE)
          - const: renesas,r8a7745

      - description: iWave Systems RZ/G1E SODIMM SOM Development Platform (iW-RainboW-G22D)
        items:
          - const: iwave,g22d
          - const: iwave,g22m
          - const: renesas,r8a7745

      - description: RZ/G1C (R8A77470)
        items:
          - enum:
              - iwave,g23s #iWave Systems RZ/G1C Single Board Computer (iW-RainboW-G23S)
          - const: renesas,r8a77470

      - description: RZ/G2M (R8A774A1)
        items:
          - const: renesas,r8a774a1

      - description: RZ/G2E (R8A774C0)
        items:
          - enum:
              - si-linux,cat874 # Silicon Linux RZ/G2E 96board platform (CAT874)
          - const: renesas,r8a774c0

      - items:
          - enum:
              - si-linux,cat875 # Silicon Linux sub board for CAT874 (CAT875)
          - const: si-linux,cat874
          - const: renesas,r8a774c0

      - description: R-Car M1A (R8A77781)
        items:
          - enum:
              - renesas,bockw
          - const: renesas,r8a7778

      - description: R-Car H1 (R8A77790)
        items:
          - enum:
              - renesas,marzen # Marzen (R0P7779A00010S)
          - const: renesas,r8a7779

      - description: R-Car H2 (R8A77900)
        items:
          - enum:
              - renesas,lager # Lager (RTP0RC7790SEB00010S)
              - renesas,stout # Stout (ADAS Starterkit, Y-R-CAR-ADAS-SKH2-BOARD)
          - const: renesas,r8a7790

      - description: R-Car M2-W (R8A77910)
        items:
          - enum:
              - renesas,henninger
              - renesas,koelsch # Koelsch (RTP0RC7791SEB00010S)
              - renesas,porter # Porter (M2-LCDP)
          - const: renesas,r8a7791

      - description: R-Car V2H (R8A77920)
        items:
          - enum:
              - renesas,blanche # Blanche (RTP0RC7792SEB00010S)
              - renesas,wheat # Wheat (RTP0RC7792ASKB0000JE)
          - const: renesas,r8a7792

      - description: R-Car M2-N (R8A77930)
        items:
          - enum:
              - renesas,gose # Gose (RTP0RC7793SEB00010S)
          - const: renesas,r8a7793

      - description: R-Car E2 (R8A77940)
        items:
          - enum:
              - renesas,alt # Alt (RTP0RC7794SEB00010S)
              - renesas,silk # SILK (RTP0RC7794LCB00011S)
          - const: renesas,r8a7794

      - description: R-Car H3 (R8A77950)
        items:
          - enum:
                # H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKBX0010SA00 (H3 ES1.1))
                # H3ULCB (R-Car Starter Kit Premier, RTP0RC77951SKBX010SA00 (H3 ES2.0))
              - renesas,h3ulcb
              - renesas,salvator-x # Salvator-X (RTP0RC7795SIPB0010S)
              - renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
          - const: renesas,r8a7795

      - description: R-Car M3-W (R8A77960)
        items:
          - enum:
              - renesas,m3ulcb # M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKBX0010SA09 (M3 ES1.0))
              - renesas,salvator-x # Salvator-X (RTP0RC7796SIPB0011S)
              - renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version, RTP0RC7796SIPB0012S)
          - const: renesas,r8a7796

      - description: Kingfisher (SBEV-RCAR-KF-M03)
        items:
          - const: shimafuji,kingfisher
          - enum:
              - renesas,h3ulcb
              - renesas,m3ulcb
          - enum:
              - renesas,r8a7795
              - renesas,r8a7796

      - description: R-Car M3-N (R8A77965)
        items:
          - enum:
              - renesas,m3nulcb # M3NULCB (R-Car Starter Kit Pro, RTP0RC77965SKBX010SA00 (M3-N ES1.1))
              - renesas,salvator-x # Salvator-X (RTP0RC7796SIPB0011S (M3-N))
              - renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version, RTP0RC77965SIPB012S)
          - const: renesas,r8a77965

      - description: R-Car V3M (R8A77970)
        items:
          - enum:
              - renesas,eagle # Eagle (RTP0RC77970SEB0010S)
              - renesas,v3msk # V3MSK (Y-ASK-RCAR-V3M-WS10)
          - const: renesas,r8a77970

      - description: R-Car V3H (R8A77980)
        items:
          - enum:
              - renesas,condor # Condor (RTP0RC77980SEB0010SS/RTP0RC77980SEB0010SA01)
              - renesas,v3hsk # V3HSK (Y-ASK-RCAR-V3H-WS10)
          - const: renesas,r8a77980

      - description: R-Car E3 (R8A77990)
        items:
          - enum:
              - renesas,ebisu # Ebisu (RTP0RC77990SEB0010S)
          - const: renesas,r8a77990

      - description: R-Car D3 (R8A77995)
        items:
          - enum:
              - renesas,draak # Draak (RTP0RC77995SEB0010S)
          - const: renesas,r8a77995

      - description: RZ/N1D (R9A06G032)
        items:
          - enum:
              - renesas,rzn1d400-db # RZN1D-DB (RZ/N1D Demo Board for the RZ/N1D 400 pins package)
          - const: renesas,r9a06g032

...
+0 −155
Original line number Diff line number Diff line
Renesas SH-Mobile, R-Mobile, and R-Car Platform Device Tree Bindings
--------------------------------------------------------------------

SoCs:

  - Emma Mobile EV2
    compatible = "renesas,emev2"
  - RZ/A1H (R7S72100)
    compatible = "renesas,r7s72100"
  - RZ/A2 (R7S9210)
    compatible = "renesas,r7s9210"
  - SH-Mobile AG5 (R8A73A00/SH73A0)
    compatible = "renesas,sh73a0"
  - R-Mobile APE6 (R8A73A40)
    compatible = "renesas,r8a73a4"
  - R-Mobile A1 (R8A77400)
    compatible = "renesas,r8a7740"
  - RZ/G1H (R8A77420)
    compatible = "renesas,r8a7742"
  - RZ/G1M (R8A77430)
    compatible = "renesas,r8a7743"
  - RZ/G1N (R8A77440)
    compatible = "renesas,r8a7744"
  - RZ/G1E (R8A77450)
    compatible = "renesas,r8a7745"
  - RZ/G1C (R8A77470)
    compatible = "renesas,r8a77470"
  - RZ/G2M (R8A774A1)
    compatible = "renesas,r8a774a1"
  - RZ/G2E (R8A774C0)
    compatible = "renesas,r8a774c0"
  - R-Car M1A (R8A77781)
    compatible = "renesas,r8a7778"
  - R-Car H1 (R8A77790)
    compatible = "renesas,r8a7779"
  - R-Car H2 (R8A77900)
    compatible = "renesas,r8a7790"
  - R-Car M2-W (R8A77910)
    compatible = "renesas,r8a7791"
  - R-Car V2H (R8A77920)
    compatible = "renesas,r8a7792"
  - R-Car M2-N (R8A77930)
    compatible = "renesas,r8a7793"
  - R-Car E2 (R8A77940)
    compatible = "renesas,r8a7794"
  - R-Car H3 (R8A77950)
    compatible = "renesas,r8a7795"
  - R-Car M3-W (R8A77960)
    compatible = "renesas,r8a7796"
  - R-Car M3-N (R8A77965)
    compatible = "renesas,r8a77965"
  - R-Car V3M (R8A77970)
    compatible = "renesas,r8a77970"
  - R-Car V3H (R8A77980)
    compatible = "renesas,r8a77980"
  - R-Car E3 (R8A77990)
    compatible = "renesas,r8a77990"
  - R-Car D3 (R8A77995)
    compatible = "renesas,r8a77995"
  - RZ/N1D (R9A06G032)
    compatible = "renesas,r9a06g032"

Boards:

  - Alt (RTP0RC7794SEB00010S)
    compatible = "renesas,alt", "renesas,r8a7794"
  - APE6-EVM
    compatible = "renesas,ape6evm", "renesas,r8a73a4"
  - Atmark Techno Armadillo-800 EVA
    compatible = "renesas,armadillo800eva", "renesas,r8a7740"
  - Blanche (RTP0RC7792SEB00010S)
    compatible = "renesas,blanche", "renesas,r8a7792"
  - BOCK-W
    compatible = "renesas,bockw", "renesas,r8a7778"
  - Condor (RTP0RC77980SEB0010SS/RTP0RC77980SEB0010SA01)
    compatible = "renesas,condor", "renesas,r8a77980"
  - Draak (RTP0RC77995SEB0010S)
    compatible = "renesas,draak", "renesas,r8a77995"
  - Eagle (RTP0RC77970SEB0010S)
    compatible = "renesas,eagle", "renesas,r8a77970"
  - Ebisu (RTP0RC77990SEB0010S)
    compatible = "renesas,ebisu", "renesas,r8a77990"
  - Genmai (RTK772100BC00000BR)
    compatible = "renesas,genmai", "renesas,r7s72100"
  - GR-Peach (X28A-M01-E/F)
    compatible = "renesas,gr-peach", "renesas,r7s72100"
  - Gose (RTP0RC7793SEB00010S)
    compatible = "renesas,gose", "renesas,r8a7793"
  - H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKBX0010SA00 (H3 ES1.1))
    H3ULCB (R-Car Starter Kit Premier, RTP0RC77951SKBX010SA00 (H3 ES2.0))
    compatible = "renesas,h3ulcb", "renesas,r8a7795"
  - Henninger
    compatible = "renesas,henninger", "renesas,r8a7791"
  - iWave Systems RZ/G1C Single Board Computer (iW-RainboW-G23S)
    compatible = "iwave,g23s", "renesas,r8a77470"
  - iWave Systems RZ/G1E SODIMM SOM Development Platform (iW-RainboW-G22D)
    compatible = "iwave,g22d", "iwave,g22m", "renesas,r8a7745"
  - iWave Systems RZ/G1E SODIMM System On Module (iW-RainboW-G22M-SM)
    compatible = "iwave,g22m", "renesas,r8a7745"
  - iWave Systems RZ/G1M Qseven Development Platform (iW-RainboW-G20D-Qseven)
    compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743"
  - iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven)
    compatible = "iwave,g20m", "renesas,r8a7743"
  - iWave Systems RZ/G1N Qseven Development Platform (iW-RainboW-G20D-Qseven)
    compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7744"
  - iWave Systems RZ/G1N Qseven System On Module (iW-RainboW-G20M-Qseven)
    compatible = "iwave,g20m", "renesas,r8a7744"
  - Kingfisher (SBEV-RCAR-KF-M03)
    compatible = "shimafuji,kingfisher"
  - Koelsch (RTP0RC7791SEB00010S)
    compatible = "renesas,koelsch", "renesas,r8a7791"
  - Kyoto Microcomputer Co. KZM-A9-Dual
    compatible = "renesas,kzm9d", "renesas,emev2"
  - Kyoto Microcomputer Co. KZM-A9-GT
    compatible = "renesas,kzm9g", "renesas,sh73a0"
  - Lager (RTP0RC7790SEB00010S)
    compatible = "renesas,lager", "renesas,r8a7790"
  - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKBX0010SA09 (M3 ES1.0))
    compatible = "renesas,m3ulcb", "renesas,r8a7796"
  - M3NULCB (R-Car Starter Kit Pro, RTP0RC77965SKBX010SA00 (M3-N ES1.1))
    compatible = "renesas,m3nulcb", "renesas,r8a77965"
  - Marzen (R0P7779A00010S)
    compatible = "renesas,marzen", "renesas,r8a7779"
  - Porter (M2-LCDP)
    compatible = "renesas,porter", "renesas,r8a7791"
  - RSKRZA1 (YR0K77210C000BE)
    compatible = "renesas,rskrza1", "renesas,r7s72100"
  - RZN1D-DB (RZ/N1D Demo Board for the RZ/N1D 400 pins package)
    compatible = "renesas,rzn1d400-db", "renesas,r9a06g032"
  - Salvator-X (RTP0RC7795SIPB0010S)
    compatible = "renesas,salvator-x", "renesas,r8a7795"
  - Salvator-X (RTP0RC7796SIPB0011S)
    compatible = "renesas,salvator-x", "renesas,r8a7796"
  - Salvator-X (RTP0RC7796SIPB0011S (M3-N))
    compatible = "renesas,salvator-x", "renesas,r8a77965"
  - Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
    compatible = "renesas,salvator-xs", "renesas,r8a7795"
  - Salvator-XS (Salvator-X 2nd version, RTP0RC7796SIPB0012S)
    compatible = "renesas,salvator-xs", "renesas,r8a7796"
  - Salvator-XS (Salvator-X 2nd version, RTP0RC77965SIPB012S)
    compatible = "renesas,salvator-xs", "renesas,r8a77965"
  - SILK (RTP0RC7794LCB00011S)
    compatible = "renesas,silk", "renesas,r8a7794"
  - SK-RZG1E (YR8A77450S000BE)
    compatible = "renesas,sk-rzg1e", "renesas,r8a7745"
  - SK-RZG1M (YR8A77430S000BE)
    compatible = "renesas,sk-rzg1m", "renesas,r8a7743"
  - Stout (ADAS Starterkit, Y-R-CAR-ADAS-SKH2-BOARD)
    compatible = "renesas,stout", "renesas,r8a7790"
  - V3HSK (Y-ASK-RCAR-V3H-WS10)
    compatible = "renesas,v3hsk", "renesas,r8a77980"
  - V3MSK (Y-ASK-RCAR-V3M-WS10)
    compatible = "renesas,v3msk", "renesas,r8a77970"
  - Wheat (RTP0RC7792ASKB0000JE)
    compatible = "renesas,wheat", "renesas,r8a7792"
+2 −2
Original line number Diff line number Diff line
@@ -1997,7 +1997,7 @@ Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
S:	Supported
F:	arch/arm64/boot/dts/renesas/
F:	Documentation/devicetree/bindings/arm/shmobile.txt
F:	Documentation/devicetree/bindings/arm/renesas.yaml
F:	drivers/soc/renesas/
F:	include/linux/soc/renesas/

@@ -2116,7 +2116,7 @@ F: arch/arm/boot/dts/sh*
F:	arch/arm/configs/shmobile_defconfig
F:	arch/arm/include/debug/renesas-scif.S
F:	arch/arm/mach-shmobile/
F:	Documentation/devicetree/bindings/arm/shmobile.txt
F:	Documentation/devicetree/bindings/arm/renesas.yaml
F:	drivers/soc/renesas/
F:	include/linux/soc/renesas/