Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86e762d9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-drivers-for-v4.20' of... 

Merge tag 'renesas-drivers-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Renesas ARM Based SoC Drivers Updates for v4.20

* Convert to SPDX identifiers
* R-Car V3M (r8a77970) and V3H (r8a77980): Document Timer Unit (TMU) bindings
* RZ/G1N (r8a7744) and RZ/G1C (r8a77470) SoCs:
  - Document APMU and SMP enable method
* RZ/G2M (r8a74a1), RZ/G1N (r8a7744) and RZ/G2E (r8a774c0) SoCs:
  - Add reset support
  - Add sysc support
* RZ/G2M (r8a774a1), RZ/G2E (r8a774c0) and RZ/A2M (r7s9210) SoCs:
  - Add support for identifying SoC
* RZ/A2M (r7s9210) SoC:
  - Add basic SoC setup support

* tag 'renesas-drivers-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

: (21 commits)
  dt-bindings: apmu: Document r8a7744 support
  dt-bindings: timer: renesas: tmu: document R8A779{7|8}0 bindings
  dt-bindings: apmu: Document r8a77470 support
  soc: renesas: rcar-rst: Add support for RZ/G1N
  dt-bindings: reset: rcar-rst: Document r8a7744 reset module
  soc: renesas: rcar-sysc: Add r8a7744 support
  dt-bindings: power: rcar-sysc: Add r8a7744 power domain index macros
  dt-bindings: power: rcar-sysc: Document r8a7744 SYSC binding
  soc: renesas: rcar-rst: Add support for RZ/G2E
  dt-bindings: reset: rcar-rst: Document r8a774c0 rst
  soc: renesas: rcar-sysc: Add r8a774c0 support
  dt-bindings: power: rcar-sysc: Document r8a774c0 sysc
  dt-bindings: power: Add r8a774c0 SYSC power domain definitions
  soc: renesas: Identify RZ/G2E
  soc: renesas: convert to SPDX identifiers
  soc: renesas: rcar-rst: Add support for RZ/G2M
  soc: renesas: rcar-sysc: Add r8a774a1 support
  dt-bindings: power: Add r8a774a1 SYSC power domain definitions
  soc: renesas: identify RZ/A2
  ARM: shmobile: Add basic RZ/A2 SoC support
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ab2dc844 fae210bb

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

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

	      Examples with soctypes are:

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

		- "renesas,r8a7744-apmu" (RZ/G1N)

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

		- "renesas,r8a77470-apmu" (RZ/G1C)

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

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

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

Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt

+3 −0
Original line number Diff line number Diff line
@@ -8,8 +8,11 @@ and various coprocessors. 
Required properties:

  - compatible: Must contain exactly one of the following:

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

      - "renesas,r8a7744-sysc" (RZ/G1N)

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

      - "renesas,r8a77470-sysc" (RZ/G1C)

      - "renesas,r8a774a1-sysc" (RZ/G2M)

      - "renesas,r8a774c0-sysc" (RZ/G2E)

      - "renesas,r8a7779-sysc" (R-Car H1)

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

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

Documentation/devicetree/bindings/reset/renesas,rst.txt

+3 −0
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ Required properties: 
		  - "renesas,<soctype>-rst" for R-Car Gen2 and Gen3, and RZ/G

		Examples with soctypes are:

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

		  - "renesas,r8a7744-rst" (RZ/G1N)

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

		  - "renesas,r8a77470-rst" (RZ/G1C)

		  - "renesas,r8a774a1-rst" (RZ/G2M)

		  - "renesas,r8a774c0-rst" (RZ/G2E)

		  - "renesas,r8a7778-reset-wdt" (R-Car M1A)

		  - "renesas,r8a7779-reset-wdt" (R-Car H1)

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

Documentation/devicetree/bindings/timer/renesas,tmu.txt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Required Properties: 
    - "renesas,tmu-r8a7740" for the r8a7740 TMU

    - "renesas,tmu-r8a7778" for the r8a7778 TMU

    - "renesas,tmu-r8a7779" for the r8a7779 TMU

    - "renesas,tmu-r8a77970" for the r8a77970 TMU

    - "renesas,tmu-r8a77980" for the r8a77980 TMU

    - "renesas,tmu" for any TMU.

      This is a fallback for the above renesas,tmu-* entries

arch/arm/mach-shmobile/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ config ARCH_R7S72100 
	select SYS_SUPPORTS_SH_MTU2

	select RENESAS_OSTM



config ARCH_R7S9210

	bool "RZ/A2 (R7S9210)"

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM



config ARCH_R8A73A4

	bool "R-Mobile APE6 (R8A73A40)"

	select ARCH_RMOBILE