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

Merge tag 'renesas-dt-bindings-for-v4.15' of... 

Merge tag 'renesas-dt-bindings-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Pull "Renesas ARM Based SoC DT Bindings Updates for v4.15" from Simon Horman:

* Consistently do not use ';' in documentation of compat strings
  for boards. A misture of using and not using a trailing ';' had
  krept in over time with not using being dominant.

* Document bindings for
  - Eagle board and r8a77970 (V3M) SoC bindings.
    Eagle is a board for the V3M SoC
  - Document Kingfisher board bindings.
    Kingfisher is an extension board for the H3ULCB and M3ULCB boards.

* Add r8a77970 (V3M) SYSC power domain definitions

  Add macros usable by the device tree sources to reference r8a77970 SYSC
  power domains by index.

* Add Renesas SoC DT bindings doc to Renesas ARM section of MAINTAINERS file

* Drop bogus node name suffix from example of /renesas,dw-hdmi binding

* Document APMU and SMP enable method for r8a7745 (RZ/G1E) SoC

* tag 'renesas-dt-bindings-for-v4.15' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: remove inconsistent ; from documentation
  arm64: renesas: document Eagle board bindings
  arm: shmobile: Document Kingfisher board DT bindings
  dt-bindings: power: add R8A77970 SYSC power domain definitions
  MAINTAINERS: Add Renesas SoC DT bindings doc to Renesas ARM sections
  ARM: shmobile: Document R-Car V3M SoC DT bindings
  dt-bindings: display: renesas: dw-hdmi: Drop bogus node name suffix
  dt-bindings: apmu: Document r8a7745 support
parents 025792ca 2e931b06

Documentation/devicetree/bindings/arm/shmobile.txt

+11 −5
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ SoCs: 
    compatible = "renesas,r8a7795"

  - R-Car M3-W (R8A77960)

    compatible = "renesas,r8a7796"

  - R-Car V3M (R8A77970)

    compatible = "renesas,r8a77970"

  - R-Car D3 (R8A77995)

    compatible = "renesas,r8a77995"
@@ -57,6 +59,8 @@ Boards: 
    compatible = "renesas,bockw", "renesas,r8a7778"

  - Draak (RTP0RC77995SEB0010S)

    compatible = "renesas,draak", "renesas,r8a77995"

  - Eagle (RTP0RC77970SEB0010S)

    compatible = "renesas,eagle", "renesas,r8a77970"

  - Genmai (RTK772100BC00000BR)

    compatible = "renesas,genmai", "renesas,r7s72100"

  - GR-Peach (X28A-M01-E/F)
@@ -65,7 +69,7 @@ Boards: 
    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";

    compatible = "renesas,h3ulcb", "renesas,r8a7795"

  - Henninger

    compatible = "renesas,henninger", "renesas,r8a7791"

  - iWave Systems RZ/G1E SODIMM SOM Development Platform (iW-RainboW-G22D)
@@ -76,6 +80,8 @@ Boards: 
    compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743"

  - iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven)

    compatible = "iwave,g20m", "renesas,r8a7743"

  - Kingfisher (SBEV-RCAR-KF-M03)

    compatible = "shimafuji,kingfisher"

  - Koelsch (RTP0RC7791SEB00010S)

    compatible = "renesas,koelsch", "renesas,r8a7791"

  - Kyoto Microcomputer Co. KZM-A9-Dual
@@ -85,7 +91,7 @@ Boards: 
  - Lager (RTP0RC7790SEB00010S)

    compatible = "renesas,lager", "renesas,r8a7790"

  - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKBX0010SA09 (M3 ES1.0))

    compatible = "renesas,m3ulcb", "renesas,r8a7796";

    compatible = "renesas,m3ulcb", "renesas,r8a7796"

  - Marzen (R0P7779A00010S)

    compatible = "renesas,marzen", "renesas,r8a7779"

  - Porter (M2-LCDP)
@@ -93,11 +99,11 @@ Boards: 
  - RSKRZA1 (YR0K77210C000BE)

    compatible = "renesas,rskrza1", "renesas,r7s72100"

  - Salvator-X (RTP0RC7795SIPB0010S)

    compatible = "renesas,salvator-x", "renesas,r8a7795";

    compatible = "renesas,salvator-x", "renesas,r8a7795"

  - Salvator-X (RTP0RC7796SIPB0011S)

    compatible = "renesas,salvator-x", "renesas,r8a7796";

    compatible = "renesas,salvator-x", "renesas,r8a7796"

  - Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)

    compatible = "renesas,salvator-xs", "renesas,r8a7795";

    compatible = "renesas,salvator-xs", "renesas,r8a7795"

  - SILK (RTP0RC7794LCB00011S)

    compatible = "renesas,silk", "renesas,r8a7794"

  - SK-RZG1E (YR8A77450S000BE)

Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Optional properties: 


Example:



	hdmi0: hdmi0@fead0000 {

	hdmi0: hdmi@fead0000 {

		compatible = "renesas,r8a7795-dw-hdmi";

		reg = <0 0xfead0000 0 0x10000>;

		interrupts = <0 389 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/power/renesas,apmu.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
- compatible: Should be "renesas,<soctype>-apmu", "renesas,apmu" as fallback.

	      Examples with soctypes are:

		- "renesas,r8a7743-apmu" (RZ/G1M)

		- "renesas,r8a7745-apmu" (RZ/G1E)

		- "renesas,r8a7790-apmu" (R-Car H2)

		- "renesas,r8a7791-apmu" (R-Car M2-W)

		- "renesas,r8a7792-apmu" (R-Car V2H)

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1768,6 +1768,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:	drivers/soc/renesas/

F:	include/linux/soc/renesas/
@@ -1887,6 +1888,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:	drivers/soc/renesas/

F:	include/linux/soc/renesas/

include/dt-bindings/power/r8a77970-sysc.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Cogent Embedded Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#ifndef __DT_BINDINGS_POWER_R8A77970_SYSC_H__

#define __DT_BINDINGS_POWER_R8A77970_SYSC_H__



/*

 * These power domain indices match the numbers of the interrupt bits

 * representing the power areas in the various Interrupt Registers

 * (e.g. SYSCISR, Interrupt Status Register)

 */



#define R8A77970_PD_CA53_CPU0		 5

#define R8A77970_PD_CA53_CPU1		 6

#define R8A77970_PD_CR7			13

#define R8A77970_PD_CA53_SCU		21

#define R8A77970_PD_A2IR0		23

#define R8A77970_PD_A3IR			24

#define R8A77970_PD_A2IR1		27

#define R8A77970_PD_A2IR2		28

#define R8A77970_PD_A2IR3		29

#define R8A77970_PD_A2SC0		30

#define R8A77970_PD_A2SC1		31



/* Always-on power area */

#define R8A77970_PD_ALWAYS_ON		32



#endif /* __DT_BINDINGS_POWER_R8A77970_SYSC_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE