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

Commit 3238ec7c authored by Simon Horman's avatar Simon Horman
Browse files

Merge tag 'renesas-rcar-sysc2-for-v4.7' into arm64-dt-pm-domain-for-v4.7

Second Round of Renesas ARM Based SoC R-Car SYSC Updates for v4.7

Introduce a DT-based driver for the R-Car System Controller, as found on
Renesas R-Car H1, R-Car Gen2, and R-Car Gen3 SoCs.
parents 9f33a8a9 23f1e2ec
Loading
Loading
Loading
Loading
+48 −0
Original line number Diff line number Diff line
DT bindings for the Renesas R-Car System Controller

== System Controller Node ==

The R-Car System Controller provides power management for the CPU cores and
various coprocessors.

Required properties:
  - compatible: Must contain exactly one of the following:
      - "renesas,r8a7779-sysc" (R-Car H1)
      - "renesas,r8a7790-sysc" (R-Car H2)
      - "renesas,r8a7791-sysc" (R-Car M2-W)
      - "renesas,r8a7792-sysc" (R-Car V2H)
      - "renesas,r8a7793-sysc" (R-Car M2-N)
      - "renesas,r8a7794-sysc" (R-Car E2)
      - "renesas,r8a7795-sysc" (R-Car H3)
  - reg: Address start and address range for the device.
  - #power-domain-cells: Must be 1.


Example:

	sysc: system-controller@e6180000 {
		compatible = "renesas,r8a7791-sysc";
		reg = <0 0xe6180000 0 0x0200>;
		#power-domain-cells = <1>;
	};


== PM Domain Consumers ==

Devices residing in a power area must refer to that power area, as documented
by the generic PM domain bindings in
Documentation/devicetree/bindings/power/power_domain.txt.

Required properties:
  - power-domains: A phandle and symbolic PM domain specifier, as defined in
		   <dt-bindings/power/r8a77*-sysc.h>.


Example:

	L2_CA15: cache-controller@0 {
		compatible = "cache";
		power-domains = <&sysc R8A7791_PD_CA15_SCU>;
		cache-unified;
		cache-level = <2>;
	};
+4 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,8 @@ 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:	drivers/soc/renesas/
F:	include/linux/soc/renesas/

ARM/RISCPC ARCHITECTURE
M:	Russell King <linux@arm.linux.org.uk>
@@ -1604,6 +1606,8 @@ F: arch/arm/configs/shmobile_defconfig
F:	arch/arm/include/debug/renesas-scif.S
F:	arch/arm/mach-shmobile/
F:	drivers/sh/
F:	drivers/soc/renesas/
F:	include/linux/soc/renesas/

ARM/SOCFPGA ARCHITECTURE
M:	Dinh Nguyen <dinguyen@opensource.altera.com>
+4 −7
Original line number Diff line number Diff line
@@ -4,11 +4,6 @@ config ARCH_SHMOBILE
config ARCH_SHMOBILE_MULTI
	bool

config PM_RCAR
	bool
	select PM
	select PM_GENERIC_DOMAINS

config PM_RMOBILE
	bool
	select PM
@@ -16,13 +11,15 @@ config PM_RMOBILE

config ARCH_RCAR_GEN1
	bool
	select PM_RCAR
	select PM
	select PM_GENERIC_DOMAINS
	select RENESAS_INTC_IRQPIN
	select SYS_SUPPORTS_SH_TMU

config ARCH_RCAR_GEN2
	bool
	select PM_RCAR
	select PM
	select PM_GENERIC_DOMAINS
	select RENESAS_IRQC
	select SYS_SUPPORTS_SH_CMT
	select PCI_DOMAINS if PCI
+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o
# PM objects
obj-$(CONFIG_SUSPEND)		+= suspend.o
obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
obj-$(CONFIG_PM_RCAR)		+= pm-rcar.o
obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o
obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o

+2 −1
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@
 * for more details.
 */

#include <linux/soc/renesas/rcar-sysc.h>

#include <asm/io.h>

#include "pm-rcar.h"
#include "r8a7779.h"

/* SYSC */
Loading