All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-20 12:02 ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

	Hi Simon, Magnus,

This patch series introduces 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.

This is a dependency for the enablement of DU and VSP on R-Car H3, as
the VSPs are located in a PM Domain.

Changes compared to v5:
  - Add Reviewed-by,
  - Drop unneeded genpd->dev_ops.active_wakeup callback,
  - Move call to pm_genpd_init() after all local initialization,

Changes compared to v4:
  - Add Reviewed-by,
  - Mask SYSC interrupts sources before enabling them (doesn't matter
    much as they're disabled at the GIC level anyway),
  - Reference r8a7791_sysc_info directly for R-Car M2-N in rcar-sysc.c,
  - Re-add explicit "always-on" power area instead of aliasing the SoC's
    Clock Domain,
  - Add "always-on" power area on R-Car H1 and Gen2 SoCs,
  - Merge the two initialization phases again,
  - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks for Clock
    Domain control,
  - Drop dependency on r8a7795 of the Clock Domain handling, as this is
    used for the "always-on" PM Domain on R-Car H1 and Gen2, too,

Changes compared to v3:
  - Add Reviewed-by,
  - Make sure not to clear reserved SYSCIMR bits that were set before,
  - Make the always-on power area implicit and always present, and an
    alias of the existing SoC's Clock Domain. This makes the number of
    power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
    and some checks.
  - Split initialization in two phases,
  - Remove the explicit dependency on the CPG/MSSR driver by forwarding
    the attach/detach callbacks to the parent PM Domain.
    If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
    common genpd code later.
  - Document that ARM cores are controlled by PSCI on R-Car Gen3
    (although the underlying CPG/APMU hardware is the same as on Gen2),
  - Drop R8A7779_PD_SH, as it's not documented in the datasheet,
  - Rename R8A779*_PD_SH to R8A779*_PD_SH_4A, and "sh" to "sh-4a" on
    R-Car Gen2,
  - Remove always-on power area from the R-Car Gen3 table, as it's now
    implicitly handled by the rcar-sysc driver,
  - Reformat tables,
  - Minor improvements (double evaluation, unused parameter, debug
    message consolidation),
  - Update MAINTAINERS.

Changes compared to v2:
  - Add Reviewed-by,
  - Rename driver from pm-rcar to rcar-sysc,
  - Create PM Domains from hierarchy in C data instead of DT,
  - Add support for an "always-on" domain, which is currently used on
    R-Car H3 only (support can be added for other R-Car SoCs, preferably
    after their migration to CPG/MSSR),
  - Drop power area A3SH on R-Car H3, as it's no longer
    documented in the datasheet, and touching it seems to crash SYSC,
  - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
    using our own copies,
  - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
    enabled to control power,
  - Mask all SYSC interrupt sources for the CPU,
  - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
    enabled on R-Car SoCs,
  - Use early_initcall() instead of core_initcall(),
  - Do not power up CPU power areas during initialization, as this is
    handled later (directly or indirectly) by the SMP code,
  - Extract bindings into its own series, "[PATCH v3 0/7] PM / Domains:
    Add DT bindings for the R-Car System Controller".

Changes compared to v1 (more details in the individual patches):
  - Moved pm-rcar from arch/arm/mach-shmobile/ to drivers/soc/renesas/,
  - Added R-Car H3 (r8a7795) support, incl. support for devices part of
    a SYSC PM domain and the CPG/MSSR clock domain,
  - Use "renesas,<type>-sysc" instead of "renesas,sysc-<type>",
  - Added fallback compatibility strings for R-Car Gen2 and Gen3.
  - Changed one-line summary prefix to match current arm-soc practices,
  - The L2 cache-controller patches have been extracted into a separate
    series ("[PATCH v3 0/7] ARM/arm64: dts: renesas: Add/complete L2
    cache-controller nodes"),
  - Minor fixes.

Dependencies:
  - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
    renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
  - renesas-devel-20160420-v4.6-rc4 (which already contains series
    "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
    Controller").

I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
ugly rebase due to dropping the commits to reference both DMA
controllers on R-Car Gen2.

For your convenience, I've pushed this, incl. all dependencies, to the
topic/rcar-sysc-pd-v6 branch of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
topic/gen3-latest branch.

This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
r8a7794/alt, and r8a7795/salvator-x.

Thanks!

Geert Uytterhoeven (11):
  soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc
  soc: renesas: rcar-sysc: Improve rcar_sysc_power() debug info
  soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
  soc: renesas: rcar-sysc: Make rcar_sysc_power_is_off() static
  soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
  soc: renesas: rcar-sysc: Add support for R-Car H1 power areas
  soc: renesas: rcar-sysc: Add support for R-Car H2 power areas
  soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas
  soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas
  soc: renesas: rcar-sysc: Add support for R-Car E2 power areas
  soc: renesas: rcar-sysc: Add support for R-Car H3 power areas

 MAINTAINERS                                        |   4 +
 arch/arm/mach-shmobile/Kconfig                     |  11 +-
 arch/arm/mach-shmobile/Makefile                    |   1 -
 arch/arm/mach-shmobile/pm-r8a7779.c                |   3 +-
 arch/arm/mach-shmobile/pm-rcar-gen2.c              |   2 +-
 arch/arm/mach-shmobile/pm-rcar.c                   | 164 ---------
 arch/arm/mach-shmobile/smp-r8a7779.c               |   2 +-
 arch/arm/mach-shmobile/smp-r8a7790.c               |   2 +-
 drivers/soc/Makefile                               |   3 +-
 drivers/soc/renesas/Makefile                       |   7 +
 drivers/soc/renesas/r8a7779-sysc.c                 |  34 ++
 drivers/soc/renesas/r8a7790-sysc.c                 |  48 +++
 drivers/soc/renesas/r8a7791-sysc.c                 |  33 ++
 drivers/soc/renesas/r8a7794-sysc.c                 |  33 ++
 drivers/soc/renesas/r8a7795-sysc.c                 |  56 +++
 drivers/soc/renesas/rcar-sysc.c                    | 401 +++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.h                    |  58 +++
 .../linux/soc/renesas/rcar-sysc.h                  |   9 +-
 18 files changed, 690 insertions(+), 181 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/pm-rcar.c
 create mode 100644 drivers/soc/renesas/Makefile
 create mode 100644 drivers/soc/renesas/r8a7779-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7790-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7791-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7794-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7795-sysc.c
 create mode 100644 drivers/soc/renesas/rcar-sysc.c
 create mode 100644 drivers/soc/renesas/rcar-sysc.h
 rename arch/arm/mach-shmobile/pm-rcar.h => include/linux/soc/renesas/rcar-sysc.h (60%)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-20 12:02 ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

	Hi Simon, Magnus,

This patch series introduces 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.

This is a dependency for the enablement of DU and VSP on R-Car H3, as
the VSPs are located in a PM Domain.

Changes compared to v5:
  - Add Reviewed-by,
  - Drop unneeded genpd->dev_ops.active_wakeup callback,
  - Move call to pm_genpd_init() after all local initialization,

Changes compared to v4:
  - Add Reviewed-by,
  - Mask SYSC interrupts sources before enabling them (doesn't matter
    much as they're disabled at the GIC level anyway),
  - Reference r8a7791_sysc_info directly for R-Car M2-N in rcar-sysc.c,
  - Re-add explicit "always-on" power area instead of aliasing the SoC's
    Clock Domain,
  - Add "always-on" power area on R-Car H1 and Gen2 SoCs,
  - Merge the two initialization phases again,
  - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks for Clock
    Domain control,
  - Drop dependency on r8a7795 of the Clock Domain handling, as this is
    used for the "always-on" PM Domain on R-Car H1 and Gen2, too,

Changes compared to v3:
  - Add Reviewed-by,
  - Make sure not to clear reserved SYSCIMR bits that were set before,
  - Make the always-on power area implicit and always present, and an
    alias of the existing SoC's Clock Domain. This makes the number of
    power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
    and some checks.
  - Split initialization in two phases,
  - Remove the explicit dependency on the CPG/MSSR driver by forwarding
    the attach/detach callbacks to the parent PM Domain.
    If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
    common genpd code later.
  - Document that ARM cores are controlled by PSCI on R-Car Gen3
    (although the underlying CPG/APMU hardware is the same as on Gen2),
  - Drop R8A7779_PD_SH, as it's not documented in the datasheet,
  - Rename R8A779*_PD_SH to R8A779*_PD_SH_4A, and "sh" to "sh-4a" on
    R-Car Gen2,
  - Remove always-on power area from the R-Car Gen3 table, as it's now
    implicitly handled by the rcar-sysc driver,
  - Reformat tables,
  - Minor improvements (double evaluation, unused parameter, debug
    message consolidation),
  - Update MAINTAINERS.

Changes compared to v2:
  - Add Reviewed-by,
  - Rename driver from pm-rcar to rcar-sysc,
  - Create PM Domains from hierarchy in C data instead of DT,
  - Add support for an "always-on" domain, which is currently used on
    R-Car H3 only (support can be added for other R-Car SoCs, preferably
    after their migration to CPG/MSSR),
  - Drop power area A3SH on R-Car H3, as it's no longer
    documented in the datasheet, and touching it seems to crash SYSC,
  - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
    using our own copies,
  - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
    enabled to control power,
  - Mask all SYSC interrupt sources for the CPU,
  - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
    enabled on R-Car SoCs,
  - Use early_initcall() instead of core_initcall(),
  - Do not power up CPU power areas during initialization, as this is
    handled later (directly or indirectly) by the SMP code,
  - Extract bindings into its own series, "[PATCH v3 0/7] PM / Domains:
    Add DT bindings for the R-Car System Controller".

Changes compared to v1 (more details in the individual patches):
  - Moved pm-rcar from arch/arm/mach-shmobile/ to drivers/soc/renesas/,
  - Added R-Car H3 (r8a7795) support, incl. support for devices part of
    a SYSC PM domain and the CPG/MSSR clock domain,
  - Use "renesas,<type>-sysc" instead of "renesas,sysc-<type>",
  - Added fallback compatibility strings for R-Car Gen2 and Gen3.
  - Changed one-line summary prefix to match current arm-soc practices,
  - The L2 cache-controller patches have been extracted into a separate
    series ("[PATCH v3 0/7] ARM/arm64: dts: renesas: Add/complete L2
    cache-controller nodes"),
  - Minor fixes.

Dependencies:
  - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
    renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
  - renesas-devel-20160420-v4.6-rc4 (which already contains series
    "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
    Controller").

I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
ugly rebase due to dropping the commits to reference both DMA
controllers on R-Car Gen2.

For your convenience, I've pushed this, incl. all dependencies, to the
topic/rcar-sysc-pd-v6 branch of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
topic/gen3-latest branch.

This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
r8a7794/alt, and r8a7795/salvator-x.

Thanks!

Geert Uytterhoeven (11):
  soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc
  soc: renesas: rcar-sysc: Improve rcar_sysc_power() debug info
  soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
  soc: renesas: rcar-sysc: Make rcar_sysc_power_is_off() static
  soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
  soc: renesas: rcar-sysc: Add support for R-Car H1 power areas
  soc: renesas: rcar-sysc: Add support for R-Car H2 power areas
  soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas
  soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas
  soc: renesas: rcar-sysc: Add support for R-Car E2 power areas
  soc: renesas: rcar-sysc: Add support for R-Car H3 power areas

 MAINTAINERS                                        |   4 +
 arch/arm/mach-shmobile/Kconfig                     |  11 +-
 arch/arm/mach-shmobile/Makefile                    |   1 -
 arch/arm/mach-shmobile/pm-r8a7779.c                |   3 +-
 arch/arm/mach-shmobile/pm-rcar-gen2.c              |   2 +-
 arch/arm/mach-shmobile/pm-rcar.c                   | 164 ---------
 arch/arm/mach-shmobile/smp-r8a7779.c               |   2 +-
 arch/arm/mach-shmobile/smp-r8a7790.c               |   2 +-
 drivers/soc/Makefile                               |   3 +-
 drivers/soc/renesas/Makefile                       |   7 +
 drivers/soc/renesas/r8a7779-sysc.c                 |  34 ++
 drivers/soc/renesas/r8a7790-sysc.c                 |  48 +++
 drivers/soc/renesas/r8a7791-sysc.c                 |  33 ++
 drivers/soc/renesas/r8a7794-sysc.c                 |  33 ++
 drivers/soc/renesas/r8a7795-sysc.c                 |  56 +++
 drivers/soc/renesas/rcar-sysc.c                    | 401 +++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.h                    |  58 +++
 .../linux/soc/renesas/rcar-sysc.h                  |   9 +-
 18 files changed, 690 insertions(+), 181 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/pm-rcar.c
 create mode 100644 drivers/soc/renesas/Makefile
 create mode 100644 drivers/soc/renesas/r8a7779-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7790-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7791-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7794-sysc.c
 create mode 100644 drivers/soc/renesas/r8a7795-sysc.c
 create mode 100644 drivers/soc/renesas/rcar-sysc.c
 create mode 100644 drivers/soc/renesas/rcar-sysc.h
 rename arch/arm/mach-shmobile/pm-rcar.h => include/linux/soc/renesas/rcar-sysc.h (60%)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 01/11] soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Move the pm-rcar driver from arch/arm/mach-shmobile/ to
drivers/soc/renesas/, and its header file to include/linux/soc/renesas/,
so it can be shared between arm32 (R-Car H1 and Gen2) and arm64 (R-Car
Gen3). Rename it to rcar-sysc as it's really a driver for the R-Car
System Controller (SYSC).

Kill the intermediate PM_RCAR config symbol, as it's not user
configurable anymore, and to prepare for SoC-specific make rules.

Add the missing #include <linux/types.h> to rcar-sysc.h, which was
exposed by different include order.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - No changes,

v4:
  - Update MAINTAINERS,

v3:
  - Add Reviewed-by,
  - Rename driver from pm-rcar to rcar-sysc,
  - Kill CONFIG_PM_RCAR,
  - Add missing include,

v2:
  - New.
---
 MAINTAINERS                                                   |  4 ++++
 arch/arm/mach-shmobile/Kconfig                                | 11 ++++-------
 arch/arm/mach-shmobile/Makefile                               |  1 -
 arch/arm/mach-shmobile/pm-r8a7779.c                           |  3 ++-
 arch/arm/mach-shmobile/pm-rcar-gen2.c                         |  2 +-
 arch/arm/mach-shmobile/smp-r8a7779.c                          |  2 +-
 arch/arm/mach-shmobile/smp-r8a7790.c                          |  2 +-
 drivers/soc/Makefile                                          |  3 ++-
 drivers/soc/renesas/Makefile                                  |  5 +++++
 .../pm-rcar.c => drivers/soc/renesas/rcar-sysc.c              |  2 +-
 .../pm-rcar.h => include/linux/soc/renesas/rcar-sysc.h        |  8 +++++---
 11 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 drivers/soc/renesas/Makefile
 rename arch/arm/mach-shmobile/pm-rcar.c => drivers/soc/renesas/rcar-sysc.c (99%)
 rename arch/arm/mach-shmobile/pm-rcar.h => include/linux/soc/renesas/rcar-sysc.h (66%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1d5b4becab6f9a1d..a0c482ff6a9727b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index f2bc5c353119e96d..fe4ccb52f9213d8b 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -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
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index a65c80ac9009d51f..ebb909c55b856a58 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -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
 
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
index 14c42a1bdf1ef20d..4174cbcbc467d047 100644
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ b/arch/arm/mach-shmobile/pm-r8a7779.c
@@ -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 */
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index 6815781ad1165ef3..691ac166a277c03f 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -13,9 +13,9 @@
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/smp.h>
+#include <linux/soc/renesas/rcar-sysc.h>
 #include <asm/io.h>
 #include "common.h"
-#include "pm-rcar.h"
 #include "rcar-gen2.h"
 
 /* RST */
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index f5c31fbc10b2efbf..c6951ee245889b8f 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -19,13 +19,13 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/soc/renesas/rcar-sysc.h>
 
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
 #include "common.h"
-#include "pm-rcar.h"
 #include "r8a7779.h"
 
 #define AVECR IOMEM(0xfe700040)
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c
index f6426c6fdefcb489..28f26d5362d8d4d2 100644
--- a/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@ -17,12 +17,12 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/io.h>
+#include <linux/soc/renesas/rcar-sysc.h>
 
 #include <asm/smp_plat.h>
 
 #include "common.h"
 #include "platsmp-apmu.h"
-#include "pm-rcar.h"
 #include "rcar-gen2.h"
 #include "r8a7790.h"
 
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 5ade71306ee10d08..380230f03874d4ad 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -9,7 +9,8 @@ obj-$(CONFIG_MACH_DOVE)		+= dove/
 obj-y				+= fsl/
 obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
 obj-$(CONFIG_ARCH_QCOM)		+= qcom/
-obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
+obj-$(CONFIG_ARCH_RENESAS)	+= renesas/
+obj-$(CONFIG_ARCH_ROCKCHIP)	+= rockchip/
 obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/
 obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
new file mode 100644
index 0000000000000000..2b64f6c9468136f9
--- /dev/null
+++ b/drivers/soc/renesas/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/drivers/soc/renesas/rcar-sysc.c
similarity index 99%
rename from arch/arm/mach-shmobile/pm-rcar.c
rename to drivers/soc/renesas/rcar-sysc.c
index 0af05d288b09c3ab..d59bcdf78f0b56ba 100644
--- a/arch/arm/mach-shmobile/pm-rcar.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -13,7 +13,7 @@
 #include <linux/mm.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
-#include "pm-rcar.h"
+#include <linux/soc/renesas/rcar-sysc.h>
 
 /* SYSC Common */
 #define SYSCSR			0x00	/* SYSC Status Register */
diff --git a/arch/arm/mach-shmobile/pm-rcar.h b/include/linux/soc/renesas/rcar-sysc.h
similarity index 66%
rename from arch/arm/mach-shmobile/pm-rcar.h
rename to include/linux/soc/renesas/rcar-sysc.h
index 1b901db4a24c4633..96f30c2883881d97 100644
--- a/arch/arm/mach-shmobile/pm-rcar.h
+++ b/include/linux/soc/renesas/rcar-sysc.h
@@ -1,5 +1,7 @@
-#ifndef PM_RCAR_H
-#define PM_RCAR_H
+#ifndef __LINUX_SOC_RENESAS_RCAR_SYSC_H__
+#define __LINUX_SOC_RENESAS_RCAR_SYSC_H__
+
+#include <linux/types.h>
 
 struct rcar_sysc_ch {
 	u16 chan_offs;
@@ -12,4 +14,4 @@ int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch);
 bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch);
 void __iomem *rcar_sysc_init(phys_addr_t base);
 
-#endif /* PM_RCAR_H */
+#endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 01/11] soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Move the pm-rcar driver from arch/arm/mach-shmobile/ to
drivers/soc/renesas/, and its header file to include/linux/soc/renesas/,
so it can be shared between arm32 (R-Car H1 and Gen2) and arm64 (R-Car
Gen3). Rename it to rcar-sysc as it's really a driver for the R-Car
System Controller (SYSC).

Kill the intermediate PM_RCAR config symbol, as it's not user
configurable anymore, and to prepare for SoC-specific make rules.

Add the missing #include <linux/types.h> to rcar-sysc.h, which was
exposed by different include order.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - No changes,

v4:
  - Update MAINTAINERS,

v3:
  - Add Reviewed-by,
  - Rename driver from pm-rcar to rcar-sysc,
  - Kill CONFIG_PM_RCAR,
  - Add missing include,

v2:
  - New.
---
 MAINTAINERS                                                   |  4 ++++
 arch/arm/mach-shmobile/Kconfig                                | 11 ++++-------
 arch/arm/mach-shmobile/Makefile                               |  1 -
 arch/arm/mach-shmobile/pm-r8a7779.c                           |  3 ++-
 arch/arm/mach-shmobile/pm-rcar-gen2.c                         |  2 +-
 arch/arm/mach-shmobile/smp-r8a7779.c                          |  2 +-
 arch/arm/mach-shmobile/smp-r8a7790.c                          |  2 +-
 drivers/soc/Makefile                                          |  3 ++-
 drivers/soc/renesas/Makefile                                  |  5 +++++
 .../pm-rcar.c => drivers/soc/renesas/rcar-sysc.c              |  2 +-
 .../pm-rcar.h => include/linux/soc/renesas/rcar-sysc.h        |  8 +++++---
 11 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 drivers/soc/renesas/Makefile
 rename arch/arm/mach-shmobile/pm-rcar.c => drivers/soc/renesas/rcar-sysc.c (99%)
 rename arch/arm/mach-shmobile/pm-rcar.h => include/linux/soc/renesas/rcar-sysc.h (66%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1d5b4becab6f9a1d..a0c482ff6a9727b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index f2bc5c353119e96d..fe4ccb52f9213d8b 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -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
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index a65c80ac9009d51f..ebb909c55b856a58 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -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
 
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
index 14c42a1bdf1ef20d..4174cbcbc467d047 100644
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ b/arch/arm/mach-shmobile/pm-r8a7779.c
@@ -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 */
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index 6815781ad1165ef3..691ac166a277c03f 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -13,9 +13,9 @@
 #include <linux/kernel.h>
 #include <linux/of.h>
 #include <linux/smp.h>
+#include <linux/soc/renesas/rcar-sysc.h>
 #include <asm/io.h>
 #include "common.h"
-#include "pm-rcar.h"
 #include "rcar-gen2.h"
 
 /* RST */
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index f5c31fbc10b2efbf..c6951ee245889b8f 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -19,13 +19,13 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/soc/renesas/rcar-sysc.h>
 
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
 #include "common.h"
-#include "pm-rcar.h"
 #include "r8a7779.h"
 
 #define AVECR IOMEM(0xfe700040)
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c
index f6426c6fdefcb489..28f26d5362d8d4d2 100644
--- a/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@ -17,12 +17,12 @@
 #include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/io.h>
+#include <linux/soc/renesas/rcar-sysc.h>
 
 #include <asm/smp_plat.h>
 
 #include "common.h"
 #include "platsmp-apmu.h"
-#include "pm-rcar.h"
 #include "rcar-gen2.h"
 #include "r8a7790.h"
 
diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 5ade71306ee10d08..380230f03874d4ad 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -9,7 +9,8 @@ obj-$(CONFIG_MACH_DOVE)		+= dove/
 obj-y				+= fsl/
 obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
 obj-$(CONFIG_ARCH_QCOM)		+= qcom/
-obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/
+obj-$(CONFIG_ARCH_RENESAS)	+= renesas/
+obj-$(CONFIG_ARCH_ROCKCHIP)	+= rockchip/
 obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/
 obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
new file mode 100644
index 0000000000000000..2b64f6c9468136f9
--- /dev/null
+++ b/drivers/soc/renesas/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/arch/arm/mach-shmobile/pm-rcar.c b/drivers/soc/renesas/rcar-sysc.c
similarity index 99%
rename from arch/arm/mach-shmobile/pm-rcar.c
rename to drivers/soc/renesas/rcar-sysc.c
index 0af05d288b09c3ab..d59bcdf78f0b56ba 100644
--- a/arch/arm/mach-shmobile/pm-rcar.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -13,7 +13,7 @@
 #include <linux/mm.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
-#include "pm-rcar.h"
+#include <linux/soc/renesas/rcar-sysc.h>
 
 /* SYSC Common */
 #define SYSCSR			0x00	/* SYSC Status Register */
diff --git a/arch/arm/mach-shmobile/pm-rcar.h b/include/linux/soc/renesas/rcar-sysc.h
similarity index 66%
rename from arch/arm/mach-shmobile/pm-rcar.h
rename to include/linux/soc/renesas/rcar-sysc.h
index 1b901db4a24c4633..96f30c2883881d97 100644
--- a/arch/arm/mach-shmobile/pm-rcar.h
+++ b/include/linux/soc/renesas/rcar-sysc.h
@@ -1,5 +1,7 @@
-#ifndef PM_RCAR_H
-#define PM_RCAR_H
+#ifndef __LINUX_SOC_RENESAS_RCAR_SYSC_H__
+#define __LINUX_SOC_RENESAS_RCAR_SYSC_H__
+
+#include <linux/types.h>
 
 struct rcar_sysc_ch {
 	u16 chan_offs;
@@ -12,4 +14,4 @@ int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch);
 bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch);
 void __iomem *rcar_sysc_init(phys_addr_t base);
 
-#endif /* PM_RCAR_H */
+#endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 02/11] soc: renesas: rcar-sysc: Improve rcar_sysc_power() debug info
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Print requested power domain state.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - No changes,

v4:
  - No changes,

v3:
  - Add Reviewed-by,

v2:
  - New.
---
 drivers/soc/renesas/rcar-sysc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index d59bcdf78f0b56ba..9ba5fd15c53bf9b9 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -128,7 +128,7 @@ static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on)
  out:
 	spin_unlock_irqrestore(&rcar_sysc_lock, flags);
 
-	pr_debug("sysc power domain %d: %08x -> %d\n",
+	pr_debug("sysc power %s domain %d: %08x -> %d\n", on ? "on" : "off",
 		 sysc_ch->isr_bit, ioread32(rcar_sysc_base + SYSCISR), ret);
 	return ret;
 }
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 02/11] soc: renesas: rcar-sysc: Improve rcar_sysc_power() debug info
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Print requested power domain state.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - No changes,

v4:
  - No changes,

v3:
  - Add Reviewed-by,

v2:
  - New.
---
 drivers/soc/renesas/rcar-sysc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index d59bcdf78f0b56ba..9ba5fd15c53bf9b9 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -128,7 +128,7 @@ static int rcar_sysc_power(const struct rcar_sysc_ch *sysc_ch, bool on)
  out:
 	spin_unlock_irqrestore(&rcar_sysc_lock, flags);
 
-	pr_debug("sysc power domain %d: %08x -> %d\n",
+	pr_debug("sysc power %s domain %d: %08x -> %d\n", on ? "on" : "off",
 		 sysc_ch->isr_bit, ioread32(rcar_sysc_base + SYSCISR), ret);
 	return ret;
 }
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Populate the SYSC PM domains from DT, based on the presence of a device
node for the System Controller. The actual power area hiearchy, and
features of specific areas are obtained from tables in the C code.

The SYSCIER and SYSCIMR register values are derived from the power areas
present, which will help to get rid of the hardcoded values in R-Car H1
and R-Car Gen2 platform code later.

Initialization is done from an early_initcall(), to make sure the PM
Domains are initialized before secondary CPU bringup.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v6:
  - Drop unneeded genpd->dev_ops.active_wakeup callback,
  - Move call to pm_genpd_init() after all local initialization,

v5:
  - Mask SYSC interrupts sources before enabling them (doesn't matter
    much as they're disabled at the GIC level anyway),
  - Re-add explicit "always-on" power area instead of aliasing the SoC's
    Clock Domain,
  - Merge the two initialization phases again,

v4:
  - Make sure not to clear reserved SYSCIMR bits that were set before,
  - Make the always-on power area implicit and always present, and an
    alias of the existing SoC's Clock Domain. This makes the number of
    power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
    and some checks.
  - Split initialization in two phases,
  - Document that ARM cores are controlled by PSCI on R-Car Gen3
    (although the underlying CPG/APMU hardware is the same as on Gen2),
  - Minor improvements (double evaluation, unused parameter, debug
    message consolidation),

v3:
  - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
    enabled on R-Car SoCs,
  - Create PM Domains from hierarchy in C data instead of DT,
  - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
    enabled to control power,
  - Mask all SYSC interrupt sources for the CPU,
  - Add support for an "always-on" domain,
  - Use early_initcall() instead of core_initcall(),
  - Do not power up CPU power areas during initialization, as this is
    handled later (directly or indirectly) by the SMP code,

v2:
  - Add missing definitions for SYSC_PWR_CA15_CPU and SYSC_PWR_CA7_CPU,
  - Add R-Car H3 (r8a7795) support,
  - Drop tests for CONFIG_ARCH_SHMOBILE_LEGACY,
  - Add missing break statements in rcar_sysc_pwr_on_off(),
  - Add missing calls to of_node_put() in error paths,
  - Fix build if CONFIG_PM=n,
  - Update compatible values,
  - Update copyright.
---
 drivers/soc/renesas/rcar-sysc.c | 202 +++++++++++++++++++++++++++++++++++++++-
 drivers/soc/renesas/rcar-sysc.h |  53 +++++++++++
 2 files changed, 254 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/rcar-sysc.h

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 9ba5fd15c53bf9b9..95f2b59cbd76f777 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -2,6 +2,7 @@
  * R-Car SYSC Power management support
  *
  * Copyright (C) 2014  Magnus Damm
+ * Copyright (C) 2015-2016 Glider bvba
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -11,10 +12,15 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mm.h>
+#include <linux/of_address.h>
+#include <linux/pm_domain.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/soc/renesas/rcar-sysc.h>
 
+#include "rcar-sysc.h"
+
 /* SYSC Common */
 #define SYSCSR			0x00	/* SYSC Status Register */
 #define SYSCISR			0x04	/* Interrupt Status Register */
@@ -29,7 +35,8 @@
 /*
  * Power Control Register Offsets inside the register block for each domain
  * Note: The "CR" registers for ARM cores exist on H1 only
- *       Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
+ *	 Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
+ *	 Use PSCI on R-Car Gen3
  */
 #define PWRSR_OFFS		0x00	/* Power Status Register */
 #define PWROFFCR_OFFS		0x04	/* Power Shutoff Control Register */
@@ -48,6 +55,8 @@
 #define SYSCISR_RETRIES		1000
 #define SYSCISR_DELAY_US	1
 
+#define RCAR_PD_ALWAYS_ON	32	/* Always-on power area */
+
 static void __iomem *rcar_sysc_base;
 static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
 
@@ -162,3 +171,194 @@ void __iomem *rcar_sysc_init(phys_addr_t base)
 
 	return rcar_sysc_base;
 }
+
+struct rcar_sysc_pd {
+	struct generic_pm_domain genpd;
+	struct rcar_sysc_ch ch;
+	unsigned int flags;
+	char name[0];
+};
+
+static inline struct rcar_sysc_pd *to_rcar_pd(struct generic_pm_domain *d)
+{
+	return container_of(d, struct rcar_sysc_pd, genpd);
+}
+
+static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd)
+{
+	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
+
+	pr_debug("%s: %s\n", __func__, genpd->name);
+
+	if (pd->flags & PD_NO_CR) {
+		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
+		return -EBUSY;
+	}
+
+	if (pd->flags & PD_BUSY) {
+		pr_debug("%s: %s busy\n", __func__, genpd->name);
+		return -EBUSY;
+	}
+
+	return rcar_sysc_power_down(&pd->ch);
+}
+
+static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
+{
+	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
+
+	pr_debug("%s: %s\n", __func__, genpd->name);
+
+	if (pd->flags & PD_NO_CR) {
+		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
+		return 0;
+	}
+
+	return rcar_sysc_power_up(&pd->ch);
+}
+
+static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
+{
+	struct generic_pm_domain *genpd = &pd->genpd;
+	const char *name = pd->genpd.name;
+	struct dev_power_governor *gov = &simple_qos_governor;
+
+	if (pd->flags & PD_CPU) {
+		/*
+		 * This domain contains a CPU core and therefore it should
+		 * only be turned off if the CPU is not in use.
+		 */
+		pr_debug("PM domain %s contains %s\n", name, "CPU");
+		pd->flags |= PD_BUSY;
+		gov = &pm_domain_always_on_gov;
+	} else if (pd->flags & PD_SCU) {
+		/*
+		 * This domain contains an SCU and cache-controller, and
+		 * therefore it should only be turned off if the CPU cores are
+		 * not in use.
+		 */
+		pr_debug("PM domain %s contains %s\n", name, "SCU");
+		pd->flags |= PD_BUSY;
+		gov = &pm_domain_always_on_gov;
+	} else if (pd->flags & PD_NO_CR) {
+		/*
+		 * This domain cannot be turned off.
+		 */
+		pd->flags |= PD_BUSY;
+		gov = &pm_domain_always_on_gov;
+	}
+
+	genpd->power_off = rcar_sysc_pd_power_off;
+	genpd->power_on = rcar_sysc_pd_power_on;
+
+	if (pd->flags & (PD_CPU | PD_NO_CR)) {
+		/* Skip CPUs (handled by SMP code) and areas without control */
+		pr_debug("%s: Not touching %s\n", __func__, genpd->name);
+		goto finalize;
+	}
+
+	if (!rcar_sysc_power_is_off(&pd->ch)) {
+		pr_debug("%s: %s is already powered\n", __func__, genpd->name);
+		goto finalize;
+	}
+
+	rcar_sysc_power_up(&pd->ch);
+
+finalize:
+	pm_genpd_init(genpd, gov, false);
+}
+
+static const struct of_device_id rcar_sysc_matches[] = {
+	{ /* sentinel */ }
+};
+
+struct rcar_pm_domains {
+	struct genpd_onecell_data onecell_data;
+	struct generic_pm_domain *domains[RCAR_PD_ALWAYS_ON + 1];
+};
+
+static int __init rcar_sysc_pd_init(void)
+{
+	const struct rcar_sysc_info *info;
+	const struct of_device_id *match;
+	struct rcar_pm_domains *domains;
+	struct device_node *np;
+	u32 syscier, syscimr;
+	void __iomem *base;
+	unsigned int i;
+	int error;
+
+	np = of_find_matching_node_and_match(NULL, rcar_sysc_matches, &match);
+	if (!np)
+		return -ENODEV;
+
+	info = match->data;
+
+	base = of_iomap(np, 0);
+	if (!base) {
+		pr_warn("%s: Cannot map regs\n", np->full_name);
+		error = -ENOMEM;
+		goto out_put;
+	}
+
+	rcar_sysc_base = base;
+
+	domains = kzalloc(sizeof(*domains), GFP_KERNEL);
+	if (!domains) {
+		error = -ENOMEM;
+		goto out_put;
+	}
+
+	domains->onecell_data.domains = domains->domains;
+	domains->onecell_data.num_domains = ARRAY_SIZE(domains->domains);
+
+	for (i = 0, syscier = 0; i < info->num_areas; i++)
+		syscier |= BIT(info->areas[i].isr_bit);
+
+	/*
+	 * Mask all interrupt sources to prevent the CPU from receiving them.
+	 * Make sure not to clear reserved bits that were set before.
+	 */
+	syscimr = ioread32(base + SYSCIMR);
+	syscimr |= syscier;
+	pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr);
+	iowrite32(syscimr, base + SYSCIMR);
+
+	/*
+	 * SYSC needs all interrupt sources enabled to control power.
+	 */
+	pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier);
+	iowrite32(syscier, base + SYSCIER);
+
+	for (i = 0; i < info->num_areas; i++) {
+		const struct rcar_sysc_area *area = &info->areas[i];
+		struct rcar_sysc_pd *pd;
+
+		pd = kzalloc(sizeof(*pd) + strlen(area->name) + 1, GFP_KERNEL);
+		if (!pd) {
+			error = -ENOMEM;
+			goto out_put;
+		}
+
+		strcpy(pd->name, area->name);
+		pd->genpd.name = pd->name;
+		pd->ch.chan_offs = area->chan_offs;
+		pd->ch.chan_bit = area->chan_bit;
+		pd->ch.isr_bit = area->isr_bit;
+		pd->flags = area->flags;
+
+		rcar_sysc_pd_setup(pd);
+		if (area->parent >= 0)
+			pm_genpd_add_subdomain(domains->domains[area->parent],
+					       &pd->genpd);
+
+		domains->domains[area->isr_bit] = &pd->genpd;
+	}
+
+	of_genpd_add_provider_onecell(np, &domains->onecell_data);
+
+out_put:
+	of_node_put(np);
+	return error;
+}
+early_initcall(rcar_sysc_pd_init);
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
new file mode 100644
index 0000000000000000..7bb48b4f7334f960
--- /dev/null
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -0,0 +1,53 @@
+/*
+ * Renesas R-Car System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+#ifndef __SOC_RENESAS_RCAR_SYSC_H__
+#define __SOC_RENESAS_RCAR_SYSC_H__
+
+#include <linux/types.h>
+
+
+/*
+ * Power Domain flags
+ */
+#define PD_CPU		BIT(0)	/* Area contains main CPU core */
+#define PD_SCU		BIT(1)	/* Area contains SCU and L2 cache */
+#define PD_NO_CR	BIT(2)	/* Area lacks PWR{ON,OFF}CR registers */
+
+#define PD_BUSY		BIT(3)	/* Busy, for internal use only */
+
+#define PD_CPU_CR	PD_CPU		  /* CPU area has CR (R-Car H1) */
+#define PD_CPU_NOCR	PD_CPU | PD_NO_CR /* CPU area lacks CR (R-Car Gen2/3) */
+#define PD_ALWAYS_ON	PD_NO_CR	  /* Always-on area */
+
+
+/*
+ * Description of a Power Area
+ */
+
+struct rcar_sysc_area {
+	const char *name;
+	u16 chan_offs;		/* Offset of PWRSR register for this area */
+	u8 chan_bit;		/* Bit in PWR* (except for PWRUP in PWRSR) */
+	u8 isr_bit;		/* Bit in SYSCI*R */
+	int parent;		/* -1 if none */
+	unsigned int flags;	/* See PD_* */
+};
+
+
+/*
+ * SoC-specific Power Area Description
+ */
+
+struct rcar_sysc_info {
+	const struct rcar_sysc_area *areas;
+	unsigned int num_areas;
+};
+
+#endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Populate the SYSC PM domains from DT, based on the presence of a device
node for the System Controller. The actual power area hiearchy, and
features of specific areas are obtained from tables in the C code.

The SYSCIER and SYSCIMR register values are derived from the power areas
present, which will help to get rid of the hardcoded values in R-Car H1
and R-Car Gen2 platform code later.

Initialization is done from an early_initcall(), to make sure the PM
Domains are initialized before secondary CPU bringup.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v6:
  - Drop unneeded genpd->dev_ops.active_wakeup callback,
  - Move call to pm_genpd_init() after all local initialization,

v5:
  - Mask SYSC interrupts sources before enabling them (doesn't matter
    much as they're disabled at the GIC level anyway),
  - Re-add explicit "always-on" power area instead of aliasing the SoC's
    Clock Domain,
  - Merge the two initialization phases again,

v4:
  - Make sure not to clear reserved SYSCIMR bits that were set before,
  - Make the always-on power area implicit and always present, and an
    alias of the existing SoC's Clock Domain. This makes the number of
    power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
    and some checks.
  - Split initialization in two phases,
  - Document that ARM cores are controlled by PSCI on R-Car Gen3
    (although the underlying CPG/APMU hardware is the same as on Gen2),
  - Minor improvements (double evaluation, unused parameter, debug
    message consolidation),

v3:
  - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
    enabled on R-Car SoCs,
  - Create PM Domains from hierarchy in C data instead of DT,
  - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
    enabled to control power,
  - Mask all SYSC interrupt sources for the CPU,
  - Add support for an "always-on" domain,
  - Use early_initcall() instead of core_initcall(),
  - Do not power up CPU power areas during initialization, as this is
    handled later (directly or indirectly) by the SMP code,

v2:
  - Add missing definitions for SYSC_PWR_CA15_CPU and SYSC_PWR_CA7_CPU,
  - Add R-Car H3 (r8a7795) support,
  - Drop tests for CONFIG_ARCH_SHMOBILE_LEGACY,
  - Add missing break statements in rcar_sysc_pwr_on_off(),
  - Add missing calls to of_node_put() in error paths,
  - Fix build if CONFIG_PM=n,
  - Update compatible values,
  - Update copyright.
---
 drivers/soc/renesas/rcar-sysc.c | 202 +++++++++++++++++++++++++++++++++++++++-
 drivers/soc/renesas/rcar-sysc.h |  53 +++++++++++
 2 files changed, 254 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/rcar-sysc.h

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 9ba5fd15c53bf9b9..95f2b59cbd76f777 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -2,6 +2,7 @@
  * R-Car SYSC Power management support
  *
  * Copyright (C) 2014  Magnus Damm
+ * Copyright (C) 2015-2016 Glider bvba
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -11,10 +12,15 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mm.h>
+#include <linux/of_address.h>
+#include <linux/pm_domain.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/soc/renesas/rcar-sysc.h>
 
+#include "rcar-sysc.h"
+
 /* SYSC Common */
 #define SYSCSR			0x00	/* SYSC Status Register */
 #define SYSCISR			0x04	/* Interrupt Status Register */
@@ -29,7 +35,8 @@
 /*
  * Power Control Register Offsets inside the register block for each domain
  * Note: The "CR" registers for ARM cores exist on H1 only
- *       Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
+ *	 Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
+ *	 Use PSCI on R-Car Gen3
  */
 #define PWRSR_OFFS		0x00	/* Power Status Register */
 #define PWROFFCR_OFFS		0x04	/* Power Shutoff Control Register */
@@ -48,6 +55,8 @@
 #define SYSCISR_RETRIES		1000
 #define SYSCISR_DELAY_US	1
 
+#define RCAR_PD_ALWAYS_ON	32	/* Always-on power area */
+
 static void __iomem *rcar_sysc_base;
 static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
 
@@ -162,3 +171,194 @@ void __iomem *rcar_sysc_init(phys_addr_t base)
 
 	return rcar_sysc_base;
 }
+
+struct rcar_sysc_pd {
+	struct generic_pm_domain genpd;
+	struct rcar_sysc_ch ch;
+	unsigned int flags;
+	char name[0];
+};
+
+static inline struct rcar_sysc_pd *to_rcar_pd(struct generic_pm_domain *d)
+{
+	return container_of(d, struct rcar_sysc_pd, genpd);
+}
+
+static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd)
+{
+	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
+
+	pr_debug("%s: %s\n", __func__, genpd->name);
+
+	if (pd->flags & PD_NO_CR) {
+		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
+		return -EBUSY;
+	}
+
+	if (pd->flags & PD_BUSY) {
+		pr_debug("%s: %s busy\n", __func__, genpd->name);
+		return -EBUSY;
+	}
+
+	return rcar_sysc_power_down(&pd->ch);
+}
+
+static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
+{
+	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
+
+	pr_debug("%s: %s\n", __func__, genpd->name);
+
+	if (pd->flags & PD_NO_CR) {
+		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
+		return 0;
+	}
+
+	return rcar_sysc_power_up(&pd->ch);
+}
+
+static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
+{
+	struct generic_pm_domain *genpd = &pd->genpd;
+	const char *name = pd->genpd.name;
+	struct dev_power_governor *gov = &simple_qos_governor;
+
+	if (pd->flags & PD_CPU) {
+		/*
+		 * This domain contains a CPU core and therefore it should
+		 * only be turned off if the CPU is not in use.
+		 */
+		pr_debug("PM domain %s contains %s\n", name, "CPU");
+		pd->flags |= PD_BUSY;
+		gov = &pm_domain_always_on_gov;
+	} else if (pd->flags & PD_SCU) {
+		/*
+		 * This domain contains an SCU and cache-controller, and
+		 * therefore it should only be turned off if the CPU cores are
+		 * not in use.
+		 */
+		pr_debug("PM domain %s contains %s\n", name, "SCU");
+		pd->flags |= PD_BUSY;
+		gov = &pm_domain_always_on_gov;
+	} else if (pd->flags & PD_NO_CR) {
+		/*
+		 * This domain cannot be turned off.
+		 */
+		pd->flags |= PD_BUSY;
+		gov = &pm_domain_always_on_gov;
+	}
+
+	genpd->power_off = rcar_sysc_pd_power_off;
+	genpd->power_on = rcar_sysc_pd_power_on;
+
+	if (pd->flags & (PD_CPU | PD_NO_CR)) {
+		/* Skip CPUs (handled by SMP code) and areas without control */
+		pr_debug("%s: Not touching %s\n", __func__, genpd->name);
+		goto finalize;
+	}
+
+	if (!rcar_sysc_power_is_off(&pd->ch)) {
+		pr_debug("%s: %s is already powered\n", __func__, genpd->name);
+		goto finalize;
+	}
+
+	rcar_sysc_power_up(&pd->ch);
+
+finalize:
+	pm_genpd_init(genpd, gov, false);
+}
+
+static const struct of_device_id rcar_sysc_matches[] = {
+	{ /* sentinel */ }
+};
+
+struct rcar_pm_domains {
+	struct genpd_onecell_data onecell_data;
+	struct generic_pm_domain *domains[RCAR_PD_ALWAYS_ON + 1];
+};
+
+static int __init rcar_sysc_pd_init(void)
+{
+	const struct rcar_sysc_info *info;
+	const struct of_device_id *match;
+	struct rcar_pm_domains *domains;
+	struct device_node *np;
+	u32 syscier, syscimr;
+	void __iomem *base;
+	unsigned int i;
+	int error;
+
+	np = of_find_matching_node_and_match(NULL, rcar_sysc_matches, &match);
+	if (!np)
+		return -ENODEV;
+
+	info = match->data;
+
+	base = of_iomap(np, 0);
+	if (!base) {
+		pr_warn("%s: Cannot map regs\n", np->full_name);
+		error = -ENOMEM;
+		goto out_put;
+	}
+
+	rcar_sysc_base = base;
+
+	domains = kzalloc(sizeof(*domains), GFP_KERNEL);
+	if (!domains) {
+		error = -ENOMEM;
+		goto out_put;
+	}
+
+	domains->onecell_data.domains = domains->domains;
+	domains->onecell_data.num_domains = ARRAY_SIZE(domains->domains);
+
+	for (i = 0, syscier = 0; i < info->num_areas; i++)
+		syscier |= BIT(info->areas[i].isr_bit);
+
+	/*
+	 * Mask all interrupt sources to prevent the CPU from receiving them.
+	 * Make sure not to clear reserved bits that were set before.
+	 */
+	syscimr = ioread32(base + SYSCIMR);
+	syscimr |= syscier;
+	pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr);
+	iowrite32(syscimr, base + SYSCIMR);
+
+	/*
+	 * SYSC needs all interrupt sources enabled to control power.
+	 */
+	pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier);
+	iowrite32(syscier, base + SYSCIER);
+
+	for (i = 0; i < info->num_areas; i++) {
+		const struct rcar_sysc_area *area = &info->areas[i];
+		struct rcar_sysc_pd *pd;
+
+		pd = kzalloc(sizeof(*pd) + strlen(area->name) + 1, GFP_KERNEL);
+		if (!pd) {
+			error = -ENOMEM;
+			goto out_put;
+		}
+
+		strcpy(pd->name, area->name);
+		pd->genpd.name = pd->name;
+		pd->ch.chan_offs = area->chan_offs;
+		pd->ch.chan_bit = area->chan_bit;
+		pd->ch.isr_bit = area->isr_bit;
+		pd->flags = area->flags;
+
+		rcar_sysc_pd_setup(pd);
+		if (area->parent >= 0)
+			pm_genpd_add_subdomain(domains->domains[area->parent],
+					       &pd->genpd);
+
+		domains->domains[area->isr_bit] = &pd->genpd;
+	}
+
+	of_genpd_add_provider_onecell(np, &domains->onecell_data);
+
+out_put:
+	of_node_put(np);
+	return error;
+}
+early_initcall(rcar_sysc_pd_init);
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
new file mode 100644
index 0000000000000000..7bb48b4f7334f960
--- /dev/null
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -0,0 +1,53 @@
+/*
+ * Renesas R-Car System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+#ifndef __SOC_RENESAS_RCAR_SYSC_H__
+#define __SOC_RENESAS_RCAR_SYSC_H__
+
+#include <linux/types.h>
+
+
+/*
+ * Power Domain flags
+ */
+#define PD_CPU		BIT(0)	/* Area contains main CPU core */
+#define PD_SCU		BIT(1)	/* Area contains SCU and L2 cache */
+#define PD_NO_CR	BIT(2)	/* Area lacks PWR{ON,OFF}CR registers */
+
+#define PD_BUSY		BIT(3)	/* Busy, for internal use only */
+
+#define PD_CPU_CR	PD_CPU		  /* CPU area has CR (R-Car H1) */
+#define PD_CPU_NOCR	PD_CPU | PD_NO_CR /* CPU area lacks CR (R-Car Gen2/3) */
+#define PD_ALWAYS_ON	PD_NO_CR	  /* Always-on area */
+
+
+/*
+ * Description of a Power Area
+ */
+
+struct rcar_sysc_area {
+	const char *name;
+	u16 chan_offs;		/* Offset of PWRSR register for this area */
+	u8 chan_bit;		/* Bit in PWR* (except for PWRUP in PWRSR) */
+	u8 isr_bit;		/* Bit in SYSCI*R */
+	int parent;		/* -1 if none */
+	unsigned int flags;	/* See PD_* */
+};
+
+
+/*
+ * SoC-specific Power Area Description
+ */
+
+struct rcar_sysc_info {
+	const struct rcar_sysc_area *areas;
+	unsigned int num_areas;
+};
+
+#endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 04/11] soc: renesas: rcar-sysc: Make rcar_sysc_power_is_off() static
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

As of commit b12ff41658171f53 ("ARM: shmobile: r8a7779: Remove legacy PM
Domain remainings"), rcar_sysc_power_is_off() is no longer used from
SoC-specific code.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - No changes,

v4:
  - Add Reviewed-by,

v3:
  - New.
---
 drivers/soc/renesas/rcar-sysc.c       | 2 +-
 include/linux/soc/renesas/rcar-sysc.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 95f2b59cbd76f777..4e760d63f2abd93f 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -152,7 +152,7 @@ int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch)
 	return rcar_sysc_power(sysc_ch, true);
 }
 
-bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)
+static bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)
 {
 	unsigned int st;
 
diff --git a/include/linux/soc/renesas/rcar-sysc.h b/include/linux/soc/renesas/rcar-sysc.h
index 96f30c2883881d97..92fc613ab23db091 100644
--- a/include/linux/soc/renesas/rcar-sysc.h
+++ b/include/linux/soc/renesas/rcar-sysc.h
@@ -11,7 +11,6 @@ struct rcar_sysc_ch {
 
 int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch);
 int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch);
-bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch);
 void __iomem *rcar_sysc_init(phys_addr_t base);
 
 #endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 04/11] soc: renesas: rcar-sysc: Make rcar_sysc_power_is_off() static
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

As of commit b12ff41658171f53 ("ARM: shmobile: r8a7779: Remove legacy PM
Domain remainings"), rcar_sysc_power_is_off() is no longer used from
SoC-specific code.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - No changes,

v4:
  - Add Reviewed-by,

v3:
  - New.
---
 drivers/soc/renesas/rcar-sysc.c       | 2 +-
 include/linux/soc/renesas/rcar-sysc.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 95f2b59cbd76f777..4e760d63f2abd93f 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -152,7 +152,7 @@ int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch)
 	return rcar_sysc_power(sysc_ch, true);
 }
 
-bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)
+static bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch)
 {
 	unsigned int st;
 
diff --git a/include/linux/soc/renesas/rcar-sysc.h b/include/linux/soc/renesas/rcar-sysc.h
index 96f30c2883881d97..92fc613ab23db091 100644
--- a/include/linux/soc/renesas/rcar-sysc.h
+++ b/include/linux/soc/renesas/rcar-sysc.h
@@ -11,7 +11,6 @@ struct rcar_sysc_ch {
 
 int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch);
 int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch);
-bool rcar_sysc_power_is_off(const struct rcar_sysc_ch *sysc_ch);
 void __iomem *rcar_sysc_init(phys_addr_t base);
 
 #endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

On R-Car H3, some power areas (e.g. A3VP) contain I/O devices, which are
also part of the CPG/MSSR Clock Domain.
On all R-Car SoCs, devices in the "always-on" PM Domain are part of the
Clock Domain served by the CPG/MSSR or CPG/MSTP driver.

Hook up the CPG/MSTP or CPG/MSSR Clock Domain attach/detach callbacks to
enable power management using module clocks. Which callback to hook up
depends on the presence of device nodes compatible with
"renesas,cpg-mstp-clocks". This clears the path for a future migration
from the CPG/MSTP to the CPG/MSSR driver on R-Car H1 and
Gen2.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - Add Reviewed-by,
  - Rebased,

v5:
  - Revert v4 changes,
  - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks,
  - Drop dependency on r8a7795, as this is used for the "always-on" PM
    Domain on R-Car H1 and Gen2, too,

v4:
  - Remove the explicit dependency on the CPG/MSSR driver by forwarding
    the attach/detach callbacks to the parent PM Domain.
    If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
    common genpd code later.

v3:
  - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
    using our own copies,

v2:
  - New.
---
 drivers/soc/renesas/rcar-sysc.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 4e760d63f2abd93f..0d49a25de740fbf8 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -9,6 +9,7 @@
  * for more details.
  */
 
+#include <linux/clk/renesas.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mm.h>
@@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
 	return rcar_sysc_power_up(&pd->ch);
 }
 
+static bool has_cpg_mstp;
+
 static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
 {
 	struct generic_pm_domain *genpd = &pd->genpd;
@@ -248,6 +251,18 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
 		gov = &pm_domain_always_on_gov;
 	}
 
+	if (!(pd->flags & (PD_CPU | PD_SCU))) {
+		/* Enable Clock Domain for I/O devices */
+		genpd->flags = GENPD_FLAG_PM_CLK;
+		if (has_cpg_mstp) {
+			genpd->attach_dev = cpg_mstp_attach_dev;
+			genpd->detach_dev = cpg_mstp_detach_dev;
+		} else {
+			genpd->attach_dev = cpg_mssr_attach_dev;
+			genpd->detach_dev = cpg_mssr_detach_dev;
+		}
+	}
+
 	genpd->power_off = rcar_sysc_pd_power_off;
 	genpd->power_on = rcar_sysc_pd_power_on;
 
@@ -294,6 +309,9 @@ static int __init rcar_sysc_pd_init(void)
 
 	info = match->data;
 
+	has_cpg_mstp = of_find_compatible_node(NULL, NULL,
+					       "renesas,cpg-mstp-clocks");
+
 	base = of_iomap(np, 0);
 	if (!base) {
 		pr_warn("%s: Cannot map regs\n", np->full_name);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

On R-Car H3, some power areas (e.g. A3VP) contain I/O devices, which are
also part of the CPG/MSSR Clock Domain.
On all R-Car SoCs, devices in the "always-on" PM Domain are part of the
Clock Domain served by the CPG/MSSR or CPG/MSTP driver.

Hook up the CPG/MSTP or CPG/MSSR Clock Domain attach/detach callbacks to
enable power management using module clocks. Which callback to hook up
depends on the presence of device nodes compatible with
"renesas,cpg-mstp-clocks". This clears the path for a future migration
from the CPG/MSTP to the CPG/MSSR driver on R-Car H1 and
Gen2.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - Add Reviewed-by,
  - Rebased,

v5:
  - Revert v4 changes,
  - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks,
  - Drop dependency on r8a7795, as this is used for the "always-on" PM
    Domain on R-Car H1 and Gen2, too,

v4:
  - Remove the explicit dependency on the CPG/MSSR driver by forwarding
    the attach/detach callbacks to the parent PM Domain.
    If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
    common genpd code later.

v3:
  - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
    using our own copies,

v2:
  - New.
---
 drivers/soc/renesas/rcar-sysc.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 4e760d63f2abd93f..0d49a25de740fbf8 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -9,6 +9,7 @@
  * for more details.
  */
 
+#include <linux/clk/renesas.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mm.h>
@@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
 	return rcar_sysc_power_up(&pd->ch);
 }
 
+static bool has_cpg_mstp;
+
 static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
 {
 	struct generic_pm_domain *genpd = &pd->genpd;
@@ -248,6 +251,18 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
 		gov = &pm_domain_always_on_gov;
 	}
 
+	if (!(pd->flags & (PD_CPU | PD_SCU))) {
+		/* Enable Clock Domain for I/O devices */
+		genpd->flags = GENPD_FLAG_PM_CLK;
+		if (has_cpg_mstp) {
+			genpd->attach_dev = cpg_mstp_attach_dev;
+			genpd->detach_dev = cpg_mstp_detach_dev;
+		} else {
+			genpd->attach_dev = cpg_mssr_attach_dev;
+			genpd->detach_dev = cpg_mssr_detach_dev;
+		}
+	}
+
 	genpd->power_off = rcar_sysc_pd_power_off;
 	genpd->power_on = rcar_sysc_pd_power_on;
 
@@ -294,6 +309,9 @@ static int __init rcar_sysc_pd_init(void)
 
 	info = match->data;
 
+	has_cpg_mstp = of_find_compatible_node(NULL, NULL,
+					       "renesas,cpg-mstp-clocks");
+
 	base = of_iomap(np, 0);
 	if (!base) {
 		pr_warn("%s: Cannot map regs\n", np->full_name);
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 06/11] soc: renesas: rcar-sysc: Add support for R-Car H1 power areas
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Drop R8A7779_PD_SH, as it's not documented in the datasheet,
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7779-sysc.c | 34 ++++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7779-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index 2b64f6c9468136f9..b8aa9db4fdd95eb8 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
 obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/r8a7779-sysc.c b/drivers/soc/renesas/r8a7779-sysc.c
new file mode 100644
index 0000000000000000..9e8e6b7faa044684
--- /dev/null
+++ b/drivers/soc/renesas/r8a7779-sysc.c
@@ -0,0 +1,34 @@
+/*
+ * Renesas R-Car H1 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7779-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7779_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7779_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "arm1",	 0x40, 1, R8A7779_PD_ARM1,	R8A7779_PD_ALWAYS_ON,
+	  PD_CPU_CR },
+	{ "arm2",	 0x40, 2, R8A7779_PD_ARM2,	R8A7779_PD_ALWAYS_ON,
+	  PD_CPU_CR },
+	{ "arm3",	 0x40, 3, R8A7779_PD_ARM3,	R8A7779_PD_ALWAYS_ON,
+	  PD_CPU_CR },
+	{ "sgx",	 0xc0, 0, R8A7779_PD_SGX,	R8A7779_PD_ALWAYS_ON },
+	{ "vdp",	0x100, 0, R8A7779_PD_VDP,	R8A7779_PD_ALWAYS_ON },
+	{ "imp",	0x140, 0, R8A7779_PD_IMP,	R8A7779_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7779_sysc_info __initconst = {
+	.areas = r8a7779_areas,
+	.num_areas = ARRAY_SIZE(r8a7779_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 0d49a25de740fbf8..858ad23ae03aa809 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -284,6 +284,9 @@ finalize:
 }
 
 static const struct of_device_id rcar_sysc_matches[] = {
+#ifdef CONFIG_ARCH_R8A7779
+	{ .compatible = "renesas,r8a7779-sysc", .data = &r8a7779_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index 7bb48b4f7334f960..7cf58b9cd544f4b9 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -50,4 +50,5 @@ struct rcar_sysc_info {
 	unsigned int num_areas;
 };
 
+extern const struct rcar_sysc_info r8a7779_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 06/11] soc: renesas: rcar-sysc: Add support for R-Car H1 power areas
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Drop R8A7779_PD_SH, as it's not documented in the datasheet,
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7779-sysc.c | 34 ++++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7779-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index 2b64f6c9468136f9..b8aa9db4fdd95eb8 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
 obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/r8a7779-sysc.c b/drivers/soc/renesas/r8a7779-sysc.c
new file mode 100644
index 0000000000000000..9e8e6b7faa044684
--- /dev/null
+++ b/drivers/soc/renesas/r8a7779-sysc.c
@@ -0,0 +1,34 @@
+/*
+ * Renesas R-Car H1 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7779-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7779_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7779_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "arm1",	 0x40, 1, R8A7779_PD_ARM1,	R8A7779_PD_ALWAYS_ON,
+	  PD_CPU_CR },
+	{ "arm2",	 0x40, 2, R8A7779_PD_ARM2,	R8A7779_PD_ALWAYS_ON,
+	  PD_CPU_CR },
+	{ "arm3",	 0x40, 3, R8A7779_PD_ARM3,	R8A7779_PD_ALWAYS_ON,
+	  PD_CPU_CR },
+	{ "sgx",	 0xc0, 0, R8A7779_PD_SGX,	R8A7779_PD_ALWAYS_ON },
+	{ "vdp",	0x100, 0, R8A7779_PD_VDP,	R8A7779_PD_ALWAYS_ON },
+	{ "imp",	0x140, 0, R8A7779_PD_IMP,	R8A7779_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7779_sysc_info __initconst = {
+	.areas = r8a7779_areas,
+	.num_areas = ARRAY_SIZE(r8a7779_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 0d49a25de740fbf8..858ad23ae03aa809 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -284,6 +284,9 @@ finalize:
 }
 
 static const struct of_device_id rcar_sysc_matches[] = {
+#ifdef CONFIG_ARCH_R8A7779
+	{ .compatible = "renesas,r8a7779-sysc", .data = &r8a7779_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index 7bb48b4f7334f960..7cf58b9cd544f4b9 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -50,4 +50,5 @@ struct rcar_sysc_info {
 	unsigned int num_areas;
 };
 
+extern const struct rcar_sysc_info r8a7779_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 07/11] soc: renesas: rcar-sysc: Add support for R-Car H2 power areas
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Rename R8A7790_PD_SH to R8A7790_PD_SH_4A, "sh" to "sh-4a",
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7790-sysc.c | 48 ++++++++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7790-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index b8aa9db4fdd95eb8..6588be3c6776fadf 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
-obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/r8a7790-sysc.c b/drivers/soc/renesas/r8a7790-sysc.c
new file mode 100644
index 0000000000000000..7a567ad0ff73c2c7
--- /dev/null
+++ b/drivers/soc/renesas/r8a7790-sysc.c
@@ -0,0 +1,48 @@
+/*
+ * Renesas R-Car H2 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7790-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7790_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7790_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca15-scu",	0x180, 0, R8A7790_PD_CA15_SCU,	R8A7790_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca15-cpu0",	 0x40, 0, R8A7790_PD_CA15_CPU0,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu1",	 0x40, 1, R8A7790_PD_CA15_CPU1,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu2",	 0x40, 2, R8A7790_PD_CA15_CPU2,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu3",	 0x40, 3, R8A7790_PD_CA15_CPU3,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-scu",	0x100, 0, R8A7790_PD_CA7_SCU,	R8A7790_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca7-cpu0",	0x1c0, 0, R8A7790_PD_CA7_CPU0,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu1",	0x1c0, 1, R8A7790_PD_CA7_CPU1,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu2",	0x1c0, 2, R8A7790_PD_CA7_CPU2,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu3",	0x1c0, 3, R8A7790_PD_CA7_CPU3,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "sh-4a",	 0x80, 0, R8A7790_PD_SH_4A,	R8A7790_PD_ALWAYS_ON },
+	{ "rgx",	 0xc0, 0, R8A7790_PD_RGX,	R8A7790_PD_ALWAYS_ON },
+	{ "imp",	0x140, 0, R8A7790_PD_IMP,	R8A7790_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7790_sysc_info __initconst = {
+	.areas = r8a7790_areas,
+	.num_areas = ARRAY_SIZE(r8a7790_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 858ad23ae03aa809..07ea25925e85ce75 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -287,6 +287,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7779
 	{ .compatible = "renesas,r8a7779-sysc", .data = &r8a7779_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7790
+	{ .compatible = "renesas,r8a7790-sysc", .data = &r8a7790_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index 7cf58b9cd544f4b9..33c8f2d00a01eac6 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -51,4 +51,5 @@ struct rcar_sysc_info {
 };
 
 extern const struct rcar_sysc_info r8a7779_sysc_info;
+extern const struct rcar_sysc_info r8a7790_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 07/11] soc: renesas: rcar-sysc: Add support for R-Car H2 power areas
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Rename R8A7790_PD_SH to R8A7790_PD_SH_4A, "sh" to "sh-4a",
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7790-sysc.c | 48 ++++++++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7790-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index b8aa9db4fdd95eb8..6588be3c6776fadf 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
-obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/r8a7790-sysc.c b/drivers/soc/renesas/r8a7790-sysc.c
new file mode 100644
index 0000000000000000..7a567ad0ff73c2c7
--- /dev/null
+++ b/drivers/soc/renesas/r8a7790-sysc.c
@@ -0,0 +1,48 @@
+/*
+ * Renesas R-Car H2 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7790-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7790_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7790_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca15-scu",	0x180, 0, R8A7790_PD_CA15_SCU,	R8A7790_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca15-cpu0",	 0x40, 0, R8A7790_PD_CA15_CPU0,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu1",	 0x40, 1, R8A7790_PD_CA15_CPU1,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu2",	 0x40, 2, R8A7790_PD_CA15_CPU2,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu3",	 0x40, 3, R8A7790_PD_CA15_CPU3,	R8A7790_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-scu",	0x100, 0, R8A7790_PD_CA7_SCU,	R8A7790_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca7-cpu0",	0x1c0, 0, R8A7790_PD_CA7_CPU0,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu1",	0x1c0, 1, R8A7790_PD_CA7_CPU1,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu2",	0x1c0, 2, R8A7790_PD_CA7_CPU2,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu3",	0x1c0, 3, R8A7790_PD_CA7_CPU3,	R8A7790_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "sh-4a",	 0x80, 0, R8A7790_PD_SH_4A,	R8A7790_PD_ALWAYS_ON },
+	{ "rgx",	 0xc0, 0, R8A7790_PD_RGX,	R8A7790_PD_ALWAYS_ON },
+	{ "imp",	0x140, 0, R8A7790_PD_IMP,	R8A7790_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7790_sysc_info __initconst = {
+	.areas = r8a7790_areas,
+	.num_areas = ARRAY_SIZE(r8a7790_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 858ad23ae03aa809..07ea25925e85ce75 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -287,6 +287,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7779
 	{ .compatible = "renesas,r8a7779-sysc", .data = &r8a7779_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7790
+	{ .compatible = "renesas,r8a7790-sysc", .data = &r8a7790_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index 7cf58b9cd544f4b9..33c8f2d00a01eac6 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -51,4 +51,5 @@ struct rcar_sysc_info {
 };
 
 extern const struct rcar_sysc_info r8a7779_sysc_info;
+extern const struct rcar_sysc_info r8a7790_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 08/11] soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Rename R8A7791_PD_SH to R8A7791_PD_SH_4A, "sh" to "sh-4a",
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7791-sysc.c | 33 +++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7791-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index 6588be3c6776fadf..96463c05ee594335 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
 obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
-obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/r8a7791-sysc.c b/drivers/soc/renesas/r8a7791-sysc.c
new file mode 100644
index 0000000000000000..03b9f41a34e62f36
--- /dev/null
+++ b/drivers/soc/renesas/r8a7791-sysc.c
@@ -0,0 +1,33 @@
+/*
+ * Renesas R-Car M2-W/N System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7791-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7791_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7791_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca15-scu",	0x180, 0, R8A7791_PD_CA15_SCU,	R8A7791_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca15-cpu0",	 0x40, 0, R8A7791_PD_CA15_CPU0,	R8A7791_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu1",	 0x40, 1, R8A7791_PD_CA15_CPU1,	R8A7791_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "sh-4a",	 0x80, 0, R8A7791_PD_SH_4A,	R8A7791_PD_ALWAYS_ON },
+	{ "sgx",	 0xc0, 0, R8A7791_PD_SGX,	R8A7791_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7791_sysc_info __initconst = {
+	.areas = r8a7791_areas,
+	.num_areas = ARRAY_SIZE(r8a7791_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 07ea25925e85ce75..5b70b93a2aa710b2 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -290,6 +290,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7790
 	{ .compatible = "renesas,r8a7790-sysc", .data = &r8a7790_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7791
+	{ .compatible = "renesas,r8a7791-sysc", .data = &r8a7791_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index 33c8f2d00a01eac6..d58b39400e790a46 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -52,4 +52,5 @@ struct rcar_sysc_info {
 
 extern const struct rcar_sysc_info r8a7779_sysc_info;
 extern const struct rcar_sysc_info r8a7790_sysc_info;
+extern const struct rcar_sysc_info r8a7791_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 08/11] soc: renesas: rcar-sysc: Add support for R-Car M2-W power areas
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Rename R8A7791_PD_SH to R8A7791_PD_SH_4A, "sh" to "sh-4a",
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7791-sysc.c | 33 +++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7791-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index 6588be3c6776fadf..96463c05ee594335 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
 obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
-obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/r8a7791-sysc.c b/drivers/soc/renesas/r8a7791-sysc.c
new file mode 100644
index 0000000000000000..03b9f41a34e62f36
--- /dev/null
+++ b/drivers/soc/renesas/r8a7791-sysc.c
@@ -0,0 +1,33 @@
+/*
+ * Renesas R-Car M2-W/N System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7791-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7791_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7791_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca15-scu",	0x180, 0, R8A7791_PD_CA15_SCU,	R8A7791_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca15-cpu0",	 0x40, 0, R8A7791_PD_CA15_CPU0,	R8A7791_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "ca15-cpu1",	 0x40, 1, R8A7791_PD_CA15_CPU1,	R8A7791_PD_CA15_SCU,
+	  PD_CPU_NOCR },
+	{ "sh-4a",	 0x80, 0, R8A7791_PD_SH_4A,	R8A7791_PD_ALWAYS_ON },
+	{ "sgx",	 0xc0, 0, R8A7791_PD_SGX,	R8A7791_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7791_sysc_info __initconst = {
+	.areas = r8a7791_areas,
+	.num_areas = ARRAY_SIZE(r8a7791_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 07ea25925e85ce75..5b70b93a2aa710b2 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -290,6 +290,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7790
 	{ .compatible = "renesas,r8a7790-sysc", .data = &r8a7790_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7791
+	{ .compatible = "renesas,r8a7791-sysc", .data = &r8a7791_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index 33c8f2d00a01eac6..d58b39400e790a46 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -52,4 +52,5 @@ struct rcar_sysc_info {
 
 extern const struct rcar_sysc_info r8a7779_sysc_info;
 extern const struct rcar_sysc_info r8a7790_sysc_info;
+extern const struct rcar_sysc_info r8a7791_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 09/11] soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

R-Car M2-N is identical to R-Car M2-W w.r.t. power domains, so reuse the
definitions from the latter.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Reference r8a7791_sysc_info directly for R-Car M2-N in rcar-sysc.c,

v4:
  - No changes,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile    | 3 ++-
 drivers/soc/renesas/rcar-sysc.c | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index 96463c05ee594335..c6c4ce7ef8a145ea 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
 obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
-obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
+# R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
+obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o r8a7791-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 5b70b93a2aa710b2..d8eaf8b2ee202ba1 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -293,6 +293,10 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7791
 	{ .compatible = "renesas,r8a7791-sysc", .data = &r8a7791_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7793
+	/* R-Car M2-N is identical to R-Car M2-W w.r.t. power domains. */
+	{ .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 09/11] soc: renesas: rcar-sysc: Add support for R-Car M2-N power areas
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

R-Car M2-N is identical to R-Car M2-W w.r.t. power domains, so reuse the
definitions from the latter.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Reference r8a7791_sysc_info directly for R-Car M2-N in rcar-sysc.c,

v4:
  - No changes,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile    | 3 ++-
 drivers/soc/renesas/rcar-sysc.c | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index 96463c05ee594335..c6c4ce7ef8a145ea 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_ARCH_R8A7779)	+= rcar-sysc.o r8a7779-sysc.o
 obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
-obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o
+# R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
+obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o r8a7791-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index 5b70b93a2aa710b2..d8eaf8b2ee202ba1 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -293,6 +293,10 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7791
 	{ .compatible = "renesas,r8a7791-sysc", .data = &r8a7791_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7793
+	/* R-Car M2-N is identical to R-Car M2-W w.r.t. power domains. */
+	{ .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 10/11] soc: renesas: rcar-sysc: Add support for R-Car E2 power areas
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Rename R8A7794_PD_SH to R8A7794_PD_SH_4A, "sh" to "sh-4a",
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7794-sysc.c | 33 +++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7794-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index c6c4ce7ef8a145ea..b328205fef36441a 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -3,4 +3,4 @@ obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
 # R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o r8a7791-sysc.o
-obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o r8a7794-sysc.o
diff --git a/drivers/soc/renesas/r8a7794-sysc.c b/drivers/soc/renesas/r8a7794-sysc.c
new file mode 100644
index 0000000000000000..c4da2941e06c9468
--- /dev/null
+++ b/drivers/soc/renesas/r8a7794-sysc.c
@@ -0,0 +1,33 @@
+/*
+ * Renesas R-Car E2 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7794-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7794_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7794_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca7-scu",	0x100, 0, R8A7794_PD_CA7_SCU,	R8A7794_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca7-cpu0",	0x1c0, 0, R8A7794_PD_CA7_CPU0,	R8A7794_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu1",	0x1c0, 1, R8A7794_PD_CA7_CPU1,	R8A7794_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "sh-4a",	 0x80, 0, R8A7794_PD_SH_4A,	R8A7794_PD_ALWAYS_ON },
+	{ "sgx",	 0xc0, 0, R8A7794_PD_SGX,	R8A7794_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7794_sysc_info __initconst = {
+	.areas = r8a7794_areas,
+	.num_areas = ARRAY_SIZE(r8a7794_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index d8eaf8b2ee202ba1..e2cd99027303ea24 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -297,6 +297,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 	/* R-Car M2-N is identical to R-Car M2-W w.r.t. power domains. */
 	{ .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7794
+	{ .compatible = "renesas,r8a7794-sysc", .data = &r8a7794_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index d58b39400e790a46..d64258cfaa20ba3f 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -53,4 +53,5 @@ struct rcar_sysc_info {
 extern const struct rcar_sysc_info r8a7779_sysc_info;
 extern const struct rcar_sysc_info r8a7790_sysc_info;
 extern const struct rcar_sysc_info r8a7791_sysc_info;
+extern const struct rcar_sysc_info r8a7794_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 10/11] soc: renesas: rcar-sysc: Add support for R-Car E2 power areas
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Add "always-on" power area,

v4:
  - Rename R8A7794_PD_SH to R8A7794_PD_SH_4A, "sh" to "sh-4a",
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  2 +-
 drivers/soc/renesas/r8a7794-sysc.c | 33 +++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 +++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 drivers/soc/renesas/r8a7794-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index c6c4ce7ef8a145ea..b328205fef36441a 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -3,4 +3,4 @@ obj-$(CONFIG_ARCH_R8A7790)	+= rcar-sysc.o r8a7790-sysc.o
 obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
 # R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o r8a7791-sysc.o
-obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o
+obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o r8a7794-sysc.o
diff --git a/drivers/soc/renesas/r8a7794-sysc.c b/drivers/soc/renesas/r8a7794-sysc.c
new file mode 100644
index 0000000000000000..c4da2941e06c9468
--- /dev/null
+++ b/drivers/soc/renesas/r8a7794-sysc.c
@@ -0,0 +1,33 @@
+/*
+ * Renesas R-Car E2 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7794-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7794_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7794_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca7-scu",	0x100, 0, R8A7794_PD_CA7_SCU,	R8A7794_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca7-cpu0",	0x1c0, 0, R8A7794_PD_CA7_CPU0,	R8A7794_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "ca7-cpu1",	0x1c0, 1, R8A7794_PD_CA7_CPU1,	R8A7794_PD_CA7_SCU,
+	  PD_CPU_NOCR },
+	{ "sh-4a",	 0x80, 0, R8A7794_PD_SH_4A,	R8A7794_PD_ALWAYS_ON },
+	{ "sgx",	 0xc0, 0, R8A7794_PD_SGX,	R8A7794_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7794_sysc_info __initconst = {
+	.areas = r8a7794_areas,
+	.num_areas = ARRAY_SIZE(r8a7794_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index d8eaf8b2ee202ba1..e2cd99027303ea24 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -297,6 +297,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 	/* R-Car M2-N is identical to R-Car M2-W w.r.t. power domains. */
 	{ .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7794
+	{ .compatible = "renesas,r8a7794-sysc", .data = &r8a7794_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index d58b39400e790a46..d64258cfaa20ba3f 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -53,4 +53,5 @@ struct rcar_sysc_info {
 extern const struct rcar_sysc_info r8a7779_sysc_info;
 extern const struct rcar_sysc_info r8a7790_sysc_info;
 extern const struct rcar_sysc_info r8a7791_sysc_info;
+extern const struct rcar_sysc_info r8a7794_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 11/11] soc: renesas: rcar-sysc: Add support for R-Car H3 power areas
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: Simon Horman, Magnus Damm
  Cc: Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, Laurent Pinchart,
	linux-renesas-soc, linux-arm-kernel, linux-pm,
	Geert Uytterhoeven

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Re-add "always-on" power area,

v4:
  - Remove "always-on" power area, as it's now implicitly handled by the
    rcar-sysc driver,
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  1 +
 drivers/soc/renesas/r8a7795-sysc.c | 56 ++++++++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 ++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 drivers/soc/renesas/r8a7795-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index b328205fef36441a..151fcd3f025b01f3 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -4,3 +4,4 @@ obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
 # R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o r8a7791-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o r8a7794-sysc.o
+obj-$(CONFIG_ARCH_R8A7795)	+= rcar-sysc.o r8a7795-sysc.o
diff --git a/drivers/soc/renesas/r8a7795-sysc.c b/drivers/soc/renesas/r8a7795-sysc.c
new file mode 100644
index 0000000000000000..5e7537c96f7bbbcd
--- /dev/null
+++ b/drivers/soc/renesas/r8a7795-sysc.c
@@ -0,0 +1,56 @@
+/*
+ * Renesas R-Car H3 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7795-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7795_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7795_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca57-scu",	0x1c0, 0, R8A7795_PD_CA57_SCU,	R8A7795_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca57-cpu0",	 0x80, 0, R8A7795_PD_CA57_CPU0,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca57-cpu1",	 0x80, 1, R8A7795_PD_CA57_CPU1,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca57-cpu2",	 0x80, 2, R8A7795_PD_CA57_CPU2,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca57-cpu3",	 0x80, 3, R8A7795_PD_CA57_CPU3,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-scu",	0x140, 0, R8A7795_PD_CA53_SCU,	R8A7795_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca53-cpu0",	0x200, 0, R8A7795_PD_CA53_CPU0,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-cpu1",	0x200, 1, R8A7795_PD_CA53_CPU1,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-cpu2",	0x200, 2, R8A7795_PD_CA53_CPU2,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-cpu3",	0x200, 3, R8A7795_PD_CA53_CPU3,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "a3vp",	0x340, 0, R8A7795_PD_A3VP,	R8A7795_PD_ALWAYS_ON },
+	{ "cr7",	0x240, 0, R8A7795_PD_CR7,	R8A7795_PD_ALWAYS_ON },
+	{ "a3vc",	0x380, 0, R8A7795_PD_A3VC,	R8A7795_PD_ALWAYS_ON },
+	{ "a2vc0",	0x3c0, 0, R8A7795_PD_A2VC0,	R8A7795_PD_A3VC },
+	{ "a2vc1",	0x3c0, 1, R8A7795_PD_A2VC1,	R8A7795_PD_A3VC },
+	{ "3dg-a",	0x100, 0, R8A7795_PD_3DG_A,	R8A7795_PD_ALWAYS_ON },
+	{ "3dg-b",	0x100, 1, R8A7795_PD_3DG_B,	R8A7795_PD_3DG_A },
+	{ "3dg-c",	0x100, 2, R8A7795_PD_3DG_C,	R8A7795_PD_3DG_B },
+	{ "3dg-d",	0x100, 3, R8A7795_PD_3DG_D,	R8A7795_PD_3DG_C },
+	{ "3dg-e",	0x100, 4, R8A7795_PD_3DG_E,	R8A7795_PD_3DG_D },
+	{ "a3ir",	0x180, 0, R8A7795_PD_A3IR,	R8A7795_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7795_sysc_info __initconst = {
+	.areas = r8a7795_areas,
+	.num_areas = ARRAY_SIZE(r8a7795_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index e2cd99027303ea24..79dbc770895f4b6d 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -300,6 +300,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7794
 	{ .compatible = "renesas,r8a7794-sysc", .data = &r8a7794_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7795
+	{ .compatible = "renesas,r8a7795-sysc", .data = &r8a7795_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index d64258cfaa20ba3f..5e766174c2f47eb0 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -54,4 +54,5 @@ extern const struct rcar_sysc_info r8a7779_sysc_info;
 extern const struct rcar_sysc_info r8a7790_sysc_info;
 extern const struct rcar_sysc_info r8a7791_sysc_info;
 extern const struct rcar_sysc_info r8a7794_sysc_info;
+extern const struct rcar_sysc_info r8a7795_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* [PATCH v6 11/11] soc: renesas: rcar-sysc: Add support for R-Car H3 power areas
@ 2016-04-20 12:02   ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-20 12:02 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v6:
  - No changes,

v5:
  - Add Reviewed-by,
  - Re-add "always-on" power area,

v4:
  - Remove "always-on" power area, as it's now implicitly handled by the
    rcar-sysc driver,
  - Reformat table,

v3:
  - New (converted from DT to C).
---
 drivers/soc/renesas/Makefile       |  1 +
 drivers/soc/renesas/r8a7795-sysc.c | 56 ++++++++++++++++++++++++++++++++++++++
 drivers/soc/renesas/rcar-sysc.c    |  3 ++
 drivers/soc/renesas/rcar-sysc.h    |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 drivers/soc/renesas/r8a7795-sysc.c

diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile
index b328205fef36441a..151fcd3f025b01f3 100644
--- a/drivers/soc/renesas/Makefile
+++ b/drivers/soc/renesas/Makefile
@@ -4,3 +4,4 @@ obj-$(CONFIG_ARCH_R8A7791)	+= rcar-sysc.o r8a7791-sysc.o
 # R-Car M2-N is identical to R-Car M2-W w.r.t. power domains.
 obj-$(CONFIG_ARCH_R8A7793)	+= rcar-sysc.o r8a7791-sysc.o
 obj-$(CONFIG_ARCH_R8A7794)	+= rcar-sysc.o r8a7794-sysc.o
+obj-$(CONFIG_ARCH_R8A7795)	+= rcar-sysc.o r8a7795-sysc.o
diff --git a/drivers/soc/renesas/r8a7795-sysc.c b/drivers/soc/renesas/r8a7795-sysc.c
new file mode 100644
index 0000000000000000..5e7537c96f7bbbcd
--- /dev/null
+++ b/drivers/soc/renesas/r8a7795-sysc.c
@@ -0,0 +1,56 @@
+/*
+ * Renesas R-Car H3 System Controller
+ *
+ * Copyright (C) 2016 Glider bvba
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ */
+
+#include <linux/bug.h>
+#include <linux/kernel.h>
+
+#include <dt-bindings/power/r8a7795-sysc.h>
+
+#include "rcar-sysc.h"
+
+static const struct rcar_sysc_area r8a7795_areas[] __initconst = {
+	{ "always-on",	    0, 0, R8A7795_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
+	{ "ca57-scu",	0x1c0, 0, R8A7795_PD_CA57_SCU,	R8A7795_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca57-cpu0",	 0x80, 0, R8A7795_PD_CA57_CPU0,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca57-cpu1",	 0x80, 1, R8A7795_PD_CA57_CPU1,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca57-cpu2",	 0x80, 2, R8A7795_PD_CA57_CPU2,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca57-cpu3",	 0x80, 3, R8A7795_PD_CA57_CPU3,	R8A7795_PD_CA57_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-scu",	0x140, 0, R8A7795_PD_CA53_SCU,	R8A7795_PD_ALWAYS_ON,
+	  PD_SCU },
+	{ "ca53-cpu0",	0x200, 0, R8A7795_PD_CA53_CPU0,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-cpu1",	0x200, 1, R8A7795_PD_CA53_CPU1,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-cpu2",	0x200, 2, R8A7795_PD_CA53_CPU2,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "ca53-cpu3",	0x200, 3, R8A7795_PD_CA53_CPU3,	R8A7795_PD_CA53_SCU,
+	  PD_CPU_NOCR },
+	{ "a3vp",	0x340, 0, R8A7795_PD_A3VP,	R8A7795_PD_ALWAYS_ON },
+	{ "cr7",	0x240, 0, R8A7795_PD_CR7,	R8A7795_PD_ALWAYS_ON },
+	{ "a3vc",	0x380, 0, R8A7795_PD_A3VC,	R8A7795_PD_ALWAYS_ON },
+	{ "a2vc0",	0x3c0, 0, R8A7795_PD_A2VC0,	R8A7795_PD_A3VC },
+	{ "a2vc1",	0x3c0, 1, R8A7795_PD_A2VC1,	R8A7795_PD_A3VC },
+	{ "3dg-a",	0x100, 0, R8A7795_PD_3DG_A,	R8A7795_PD_ALWAYS_ON },
+	{ "3dg-b",	0x100, 1, R8A7795_PD_3DG_B,	R8A7795_PD_3DG_A },
+	{ "3dg-c",	0x100, 2, R8A7795_PD_3DG_C,	R8A7795_PD_3DG_B },
+	{ "3dg-d",	0x100, 3, R8A7795_PD_3DG_D,	R8A7795_PD_3DG_C },
+	{ "3dg-e",	0x100, 4, R8A7795_PD_3DG_E,	R8A7795_PD_3DG_D },
+	{ "a3ir",	0x180, 0, R8A7795_PD_A3IR,	R8A7795_PD_ALWAYS_ON },
+};
+
+const struct rcar_sysc_info r8a7795_sysc_info __initconst = {
+	.areas = r8a7795_areas,
+	.num_areas = ARRAY_SIZE(r8a7795_areas),
+};
diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
index e2cd99027303ea24..79dbc770895f4b6d 100644
--- a/drivers/soc/renesas/rcar-sysc.c
+++ b/drivers/soc/renesas/rcar-sysc.c
@@ -300,6 +300,9 @@ static const struct of_device_id rcar_sysc_matches[] = {
 #ifdef CONFIG_ARCH_R8A7794
 	{ .compatible = "renesas,r8a7794-sysc", .data = &r8a7794_sysc_info },
 #endif
+#ifdef CONFIG_ARCH_R8A7795
+	{ .compatible = "renesas,r8a7795-sysc", .data = &r8a7795_sysc_info },
+#endif
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
index d64258cfaa20ba3f..5e766174c2f47eb0 100644
--- a/drivers/soc/renesas/rcar-sysc.h
+++ b/drivers/soc/renesas/rcar-sysc.h
@@ -54,4 +54,5 @@ extern const struct rcar_sysc_info r8a7779_sysc_info;
 extern const struct rcar_sysc_info r8a7790_sysc_info;
 extern const struct rcar_sysc_info r8a7791_sysc_info;
 extern const struct rcar_sysc_info r8a7794_sysc_info;
+extern const struct rcar_sysc_info r8a7795_sysc_info;
 #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
  2016-04-20 12:02   ` Geert Uytterhoeven
@ 2016-04-20 13:59     ` Laurent Pinchart
  -1 siblings, 0 replies; 48+ messages in thread
From: Laurent Pinchart @ 2016-04-20 13:59 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Simon Horman, Magnus Damm, Rafael J. Wysocki, Kevin Hilman,
	Ulf Hansson, linux-renesas-soc, linux-arm-kernel, linux-pm

Hi Geert,

Thank you for the patch.

On Wednesday 20 Apr 2016 14:02:38 Geert Uytterhoeven wrote:
> Populate the SYSC PM domains from DT, based on the presence of a device
> node for the System Controller. The actual power area hiearchy, and
> features of specific areas are obtained from tables in the C code.
> 
> The SYSCIER and SYSCIMR register values are derived from the power areas
> present, which will help to get rid of the hardcoded values in R-Car H1
> and R-Car Gen2 platform code later.
> 
> Initialization is done from an early_initcall(), to make sure the PM
> Domains are initialized before secondary CPU bringup.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v6:
>   - Drop unneeded genpd->dev_ops.active_wakeup callback,
>   - Move call to pm_genpd_init() after all local initialization,
> 
> v5:
>   - Mask SYSC interrupts sources before enabling them (doesn't matter
>     much as they're disabled at the GIC level anyway),
>   - Re-add explicit "always-on" power area instead of aliasing the SoC's
>     Clock Domain,
>   - Merge the two initialization phases again,
> 
> v4:
>   - Make sure not to clear reserved SYSCIMR bits that were set before,
>   - Make the always-on power area implicit and always present, and an
>     alias of the existing SoC's Clock Domain. This makes the number of
>     power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
>     and some checks.
>   - Split initialization in two phases,
>   - Document that ARM cores are controlled by PSCI on R-Car Gen3
>     (although the underlying CPG/APMU hardware is the same as on Gen2),
>   - Minor improvements (double evaluation, unused parameter, debug
>     message consolidation),
> 
> v3:
>   - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
>     enabled on R-Car SoCs,
>   - Create PM Domains from hierarchy in C data instead of DT,
>   - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
>     enabled to control power,
>   - Mask all SYSC interrupt sources for the CPU,
>   - Add support for an "always-on" domain,
>   - Use early_initcall() instead of core_initcall(),
>   - Do not power up CPU power areas during initialization, as this is
>     handled later (directly or indirectly) by the SMP code,
> 
> v2:
>   - Add missing definitions for SYSC_PWR_CA15_CPU and SYSC_PWR_CA7_CPU,
>   - Add R-Car H3 (r8a7795) support,
>   - Drop tests for CONFIG_ARCH_SHMOBILE_LEGACY,
>   - Add missing break statements in rcar_sysc_pwr_on_off(),
>   - Add missing calls to of_node_put() in error paths,
>   - Fix build if CONFIG_PM=n,
>   - Update compatible values,
>   - Update copyright.
> ---
>  drivers/soc/renesas/rcar-sysc.c | 202
> +++++++++++++++++++++++++++++++++++++++- drivers/soc/renesas/rcar-sysc.h | 
> 53 +++++++++++
>  2 files changed, 254 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/soc/renesas/rcar-sysc.h
> 
> diff --git a/drivers/soc/renesas/rcar-sysc.c
> b/drivers/soc/renesas/rcar-sysc.c index 9ba5fd15c53bf9b9..95f2b59cbd76f777
> 100644
> --- a/drivers/soc/renesas/rcar-sysc.c
> +++ b/drivers/soc/renesas/rcar-sysc.c
> @@ -2,6 +2,7 @@
>   * R-Car SYSC Power management support
>   *
>   * Copyright (C) 2014  Magnus Damm
> + * Copyright (C) 2015-2016 Glider bvba
>   *
>   * This file is subject to the terms and conditions of the GNU General
> Public * License.  See the file "COPYING" in the main directory of this
> archive @@ -11,10 +12,15 @@
>  #include <linux/delay.h>
>  #include <linux/err.h>
>  #include <linux/mm.h>
> +#include <linux/of_address.h>
> +#include <linux/pm_domain.h>
> +#include <linux/slab.h>
>  #include <linux/spinlock.h>
>  #include <linux/io.h>
>  #include <linux/soc/renesas/rcar-sysc.h>
> 
> +#include "rcar-sysc.h"
> +
>  /* SYSC Common */
>  #define SYSCSR			0x00	/* SYSC Status Register */
>  #define SYSCISR			0x04	/* Interrupt Status Register */
> @@ -29,7 +35,8 @@
>  /*
>   * Power Control Register Offsets inside the register block for each domain
> * Note: The "CR" registers for ARM cores exist on H1 only
> - *       Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *	 Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *	 Use PSCI on R-Car Gen3
>   */
>  #define PWRSR_OFFS		0x00	/* Power Status Register */
>  #define PWROFFCR_OFFS		0x04	/* Power Shutoff Control Register */
> @@ -48,6 +55,8 @@
>  #define SYSCISR_RETRIES		1000
>  #define SYSCISR_DELAY_US	1
> 
> +#define RCAR_PD_ALWAYS_ON	32	/* Always-on power area */
> +
>  static void __iomem *rcar_sysc_base;
>  static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
> 
> @@ -162,3 +171,194 @@ void __iomem *rcar_sysc_init(phys_addr_t base)
> 
>  	return rcar_sysc_base;
>  }
> +
> +struct rcar_sysc_pd {
> +	struct generic_pm_domain genpd;
> +	struct rcar_sysc_ch ch;
> +	unsigned int flags;
> +	char name[0];
> +};
> +
> +static inline struct rcar_sysc_pd *to_rcar_pd(struct generic_pm_domain *d)
> +{
> +	return container_of(d, struct rcar_sysc_pd, genpd);
> +}
> +
> +static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd)
> +{
> +	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +	pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +	if (pd->flags & PD_NO_CR) {
> +		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +		return -EBUSY;
> +	}
> +
> +	if (pd->flags & PD_BUSY) {
> +		pr_debug("%s: %s busy\n", __func__, genpd->name);
> +		return -EBUSY;
> +	}
> +
> +	return rcar_sysc_power_down(&pd->ch);
> +}
> +
> +static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
> +{
> +	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +	pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +	if (pd->flags & PD_NO_CR) {
> +		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +		return 0;
> +	}
> +
> +	return rcar_sysc_power_up(&pd->ch);
> +}
> +
> +static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
> +{
> +	struct generic_pm_domain *genpd = &pd->genpd;
> +	const char *name = pd->genpd.name;
> +	struct dev_power_governor *gov = &simple_qos_governor;
> +
> +	if (pd->flags & PD_CPU) {
> +		/*
> +		 * This domain contains a CPU core and therefore it should
> +		 * only be turned off if the CPU is not in use.
> +		 */
> +		pr_debug("PM domain %s contains %s\n", name, "CPU");
> +		pd->flags |= PD_BUSY;
> +		gov = &pm_domain_always_on_gov;
> +	} else if (pd->flags & PD_SCU) {
> +		/*
> +		 * This domain contains an SCU and cache-controller, and
> +		 * therefore it should only be turned off if the CPU cores are
> +		 * not in use.
> +		 */
> +		pr_debug("PM domain %s contains %s\n", name, "SCU");
> +		pd->flags |= PD_BUSY;
> +		gov = &pm_domain_always_on_gov;
> +	} else if (pd->flags & PD_NO_CR) {
> +		/*
> +		 * This domain cannot be turned off.
> +		 */
> +		pd->flags |= PD_BUSY;
> +		gov = &pm_domain_always_on_gov;
> +	}
> +
> +	genpd->power_off = rcar_sysc_pd_power_off;
> +	genpd->power_on = rcar_sysc_pd_power_on;
> +
> +	if (pd->flags & (PD_CPU | PD_NO_CR)) {
> +		/* Skip CPUs (handled by SMP code) and areas without control */
> +		pr_debug("%s: Not touching %s\n", __func__, genpd->name);
> +		goto finalize;
> +	}
> +
> +	if (!rcar_sysc_power_is_off(&pd->ch)) {
> +		pr_debug("%s: %s is already powered\n", __func__, genpd->name);
> +		goto finalize;
> +	}
> +
> +	rcar_sysc_power_up(&pd->ch);
> +
> +finalize:
> +	pm_genpd_init(genpd, gov, false);
> +}
> +
> +static const struct of_device_id rcar_sysc_matches[] = {
> +	{ /* sentinel */ }
> +};
> +
> +struct rcar_pm_domains {
> +	struct genpd_onecell_data onecell_data;
> +	struct generic_pm_domain *domains[RCAR_PD_ALWAYS_ON + 1];
> +};
> +
> +static int __init rcar_sysc_pd_init(void)
> +{
> +	const struct rcar_sysc_info *info;
> +	const struct of_device_id *match;
> +	struct rcar_pm_domains *domains;
> +	struct device_node *np;
> +	u32 syscier, syscimr;
> +	void __iomem *base;
> +	unsigned int i;
> +	int error;
> +
> +	np = of_find_matching_node_and_match(NULL, rcar_sysc_matches, &match);
> +	if (!np)
> +		return -ENODEV;
> +
> +	info = match->data;
> +
> +	base = of_iomap(np, 0);
> +	if (!base) {
> +		pr_warn("%s: Cannot map regs\n", np->full_name);
> +		error = -ENOMEM;
> +		goto out_put;
> +	}
> +
> +	rcar_sysc_base = base;
> +
> +	domains = kzalloc(sizeof(*domains), GFP_KERNEL);
> +	if (!domains) {
> +		error = -ENOMEM;
> +		goto out_put;
> +	}
> +
> +	domains->onecell_data.domains = domains->domains;
> +	domains->onecell_data.num_domains = ARRAY_SIZE(domains->domains);
> +
> +	for (i = 0, syscier = 0; i < info->num_areas; i++)
> +		syscier |= BIT(info->areas[i].isr_bit);
> +
> +	/*
> +	 * Mask all interrupt sources to prevent the CPU from receiving them.
> +	 * Make sure not to clear reserved bits that were set before.
> +	 */
> +	syscimr = ioread32(base + SYSCIMR);
> +	syscimr |= syscier;
> +	pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr);
> +	iowrite32(syscimr, base + SYSCIMR);
> +
> +	/*
> +	 * SYSC needs all interrupt sources enabled to control power.
> +	 */
> +	pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier);
> +	iowrite32(syscier, base + SYSCIER);
> +
> +	for (i = 0; i < info->num_areas; i++) {
> +		const struct rcar_sysc_area *area = &info->areas[i];
> +		struct rcar_sysc_pd *pd;
> +
> +		pd = kzalloc(sizeof(*pd) + strlen(area->name) + 1, GFP_KERNEL);
> +		if (!pd) {
> +			error = -ENOMEM;
> +			goto out_put;
> +		}
> +
> +		strcpy(pd->name, area->name);
> +		pd->genpd.name = pd->name;
> +		pd->ch.chan_offs = area->chan_offs;
> +		pd->ch.chan_bit = area->chan_bit;
> +		pd->ch.isr_bit = area->isr_bit;
> +		pd->flags = area->flags;
> +
> +		rcar_sysc_pd_setup(pd);
> +		if (area->parent >= 0)
> +			pm_genpd_add_subdomain(domains->domains[area->parent],
> +					       &pd->genpd);
> +
> +		domains->domains[area->isr_bit] = &pd->genpd;
> +	}
> +
> +	of_genpd_add_provider_onecell(np, &domains->onecell_data);
> +
> +out_put:
> +	of_node_put(np);
> +	return error;
> +}
> +early_initcall(rcar_sysc_pd_init);
> diff --git a/drivers/soc/renesas/rcar-sysc.h
> b/drivers/soc/renesas/rcar-sysc.h new file mode 100644
> index 0000000000000000..7bb48b4f7334f960
> --- /dev/null
> +++ b/drivers/soc/renesas/rcar-sysc.h
> @@ -0,0 +1,53 @@
> +/*
> + * Renesas R-Car System Controller
> + *
> + * Copyright (C) 2016 Glider bvba
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + */
> +#ifndef __SOC_RENESAS_RCAR_SYSC_H__
> +#define __SOC_RENESAS_RCAR_SYSC_H__
> +
> +#include <linux/types.h>
> +
> +
> +/*
> + * Power Domain flags
> + */
> +#define PD_CPU		BIT(0)	/* Area contains main CPU core */
> +#define PD_SCU		BIT(1)	/* Area contains SCU and L2 cache */
> +#define PD_NO_CR	BIT(2)	/* Area lacks PWR{ON,OFF}CR registers */
> +
> +#define PD_BUSY		BIT(3)	/* Busy, for internal use only */
> +
> +#define PD_CPU_CR	PD_CPU		  /* CPU area has CR (R-Car H1) */
> +#define PD_CPU_NOCR	PD_CPU | PD_NO_CR /* CPU area lacks CR (R-Car Gen2/3)
> */ +#define PD_ALWAYS_ON	PD_NO_CR	  /* Always-on area */
> +
> +
> +/*
> + * Description of a Power Area
> + */
> +
> +struct rcar_sysc_area {
> +	const char *name;
> +	u16 chan_offs;		/* Offset of PWRSR register for this area */
> +	u8 chan_bit;		/* Bit in PWR* (except for PWRUP in PWRSR) */
> +	u8 isr_bit;		/* Bit in SYSCI*R */
> +	int parent;		/* -1 if none */
> +	unsigned int flags;	/* See PD_* */
> +};
> +
> +
> +/*
> + * SoC-specific Power Area Description
> + */
> +
> +struct rcar_sysc_info {
> +	const struct rcar_sysc_area *areas;
> +	unsigned int num_areas;
> +};
> +
> +#endif /* __SOC_RENESAS_RCAR_SYSC_H__ */

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
@ 2016-04-20 13:59     ` Laurent Pinchart
  0 siblings, 0 replies; 48+ messages in thread
From: Laurent Pinchart @ 2016-04-20 13:59 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Geert,

Thank you for the patch.

On Wednesday 20 Apr 2016 14:02:38 Geert Uytterhoeven wrote:
> Populate the SYSC PM domains from DT, based on the presence of a device
> node for the System Controller. The actual power area hiearchy, and
> features of specific areas are obtained from tables in the C code.
> 
> The SYSCIER and SYSCIMR register values are derived from the power areas
> present, which will help to get rid of the hardcoded values in R-Car H1
> and R-Car Gen2 platform code later.
> 
> Initialization is done from an early_initcall(), to make sure the PM
> Domains are initialized before secondary CPU bringup.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> v6:
>   - Drop unneeded genpd->dev_ops.active_wakeup callback,
>   - Move call to pm_genpd_init() after all local initialization,
> 
> v5:
>   - Mask SYSC interrupts sources before enabling them (doesn't matter
>     much as they're disabled at the GIC level anyway),
>   - Re-add explicit "always-on" power area instead of aliasing the SoC's
>     Clock Domain,
>   - Merge the two initialization phases again,
> 
> v4:
>   - Make sure not to clear reserved SYSCIMR bits that were set before,
>   - Make the always-on power area implicit and always present, and an
>     alias of the existing SoC's Clock Domain. This makes the number of
>     power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
>     and some checks.
>   - Split initialization in two phases,
>   - Document that ARM cores are controlled by PSCI on R-Car Gen3
>     (although the underlying CPG/APMU hardware is the same as on Gen2),
>   - Minor improvements (double evaluation, unused parameter, debug
>     message consolidation),
> 
> v3:
>   - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
>     enabled on R-Car SoCs,
>   - Create PM Domains from hierarchy in C data instead of DT,
>   - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
>     enabled to control power,
>   - Mask all SYSC interrupt sources for the CPU,
>   - Add support for an "always-on" domain,
>   - Use early_initcall() instead of core_initcall(),
>   - Do not power up CPU power areas during initialization, as this is
>     handled later (directly or indirectly) by the SMP code,
> 
> v2:
>   - Add missing definitions for SYSC_PWR_CA15_CPU and SYSC_PWR_CA7_CPU,
>   - Add R-Car H3 (r8a7795) support,
>   - Drop tests for CONFIG_ARCH_SHMOBILE_LEGACY,
>   - Add missing break statements in rcar_sysc_pwr_on_off(),
>   - Add missing calls to of_node_put() in error paths,
>   - Fix build if CONFIG_PM=n,
>   - Update compatible values,
>   - Update copyright.
> ---
>  drivers/soc/renesas/rcar-sysc.c | 202
> +++++++++++++++++++++++++++++++++++++++- drivers/soc/renesas/rcar-sysc.h | 
> 53 +++++++++++
>  2 files changed, 254 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/soc/renesas/rcar-sysc.h
> 
> diff --git a/drivers/soc/renesas/rcar-sysc.c
> b/drivers/soc/renesas/rcar-sysc.c index 9ba5fd15c53bf9b9..95f2b59cbd76f777
> 100644
> --- a/drivers/soc/renesas/rcar-sysc.c
> +++ b/drivers/soc/renesas/rcar-sysc.c
> @@ -2,6 +2,7 @@
>   * R-Car SYSC Power management support
>   *
>   * Copyright (C) 2014  Magnus Damm
> + * Copyright (C) 2015-2016 Glider bvba
>   *
>   * This file is subject to the terms and conditions of the GNU General
> Public * License.  See the file "COPYING" in the main directory of this
> archive @@ -11,10 +12,15 @@
>  #include <linux/delay.h>
>  #include <linux/err.h>
>  #include <linux/mm.h>
> +#include <linux/of_address.h>
> +#include <linux/pm_domain.h>
> +#include <linux/slab.h>
>  #include <linux/spinlock.h>
>  #include <linux/io.h>
>  #include <linux/soc/renesas/rcar-sysc.h>
> 
> +#include "rcar-sysc.h"
> +
>  /* SYSC Common */
>  #define SYSCSR			0x00	/* SYSC Status Register */
>  #define SYSCISR			0x04	/* Interrupt Status Register */
> @@ -29,7 +35,8 @@
>  /*
>   * Power Control Register Offsets inside the register block for each domain
> * Note: The "CR" registers for ARM cores exist on H1 only
> - *       Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *	 Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *	 Use PSCI on R-Car Gen3
>   */
>  #define PWRSR_OFFS		0x00	/* Power Status Register */
>  #define PWROFFCR_OFFS		0x04	/* Power Shutoff Control Register */
> @@ -48,6 +55,8 @@
>  #define SYSCISR_RETRIES		1000
>  #define SYSCISR_DELAY_US	1
> 
> +#define RCAR_PD_ALWAYS_ON	32	/* Always-on power area */
> +
>  static void __iomem *rcar_sysc_base;
>  static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
> 
> @@ -162,3 +171,194 @@ void __iomem *rcar_sysc_init(phys_addr_t base)
> 
>  	return rcar_sysc_base;
>  }
> +
> +struct rcar_sysc_pd {
> +	struct generic_pm_domain genpd;
> +	struct rcar_sysc_ch ch;
> +	unsigned int flags;
> +	char name[0];
> +};
> +
> +static inline struct rcar_sysc_pd *to_rcar_pd(struct generic_pm_domain *d)
> +{
> +	return container_of(d, struct rcar_sysc_pd, genpd);
> +}
> +
> +static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd)
> +{
> +	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +	pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +	if (pd->flags & PD_NO_CR) {
> +		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +		return -EBUSY;
> +	}
> +
> +	if (pd->flags & PD_BUSY) {
> +		pr_debug("%s: %s busy\n", __func__, genpd->name);
> +		return -EBUSY;
> +	}
> +
> +	return rcar_sysc_power_down(&pd->ch);
> +}
> +
> +static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
> +{
> +	struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +	pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +	if (pd->flags & PD_NO_CR) {
> +		pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +		return 0;
> +	}
> +
> +	return rcar_sysc_power_up(&pd->ch);
> +}
> +
> +static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
> +{
> +	struct generic_pm_domain *genpd = &pd->genpd;
> +	const char *name = pd->genpd.name;
> +	struct dev_power_governor *gov = &simple_qos_governor;
> +
> +	if (pd->flags & PD_CPU) {
> +		/*
> +		 * This domain contains a CPU core and therefore it should
> +		 * only be turned off if the CPU is not in use.
> +		 */
> +		pr_debug("PM domain %s contains %s\n", name, "CPU");
> +		pd->flags |= PD_BUSY;
> +		gov = &pm_domain_always_on_gov;
> +	} else if (pd->flags & PD_SCU) {
> +		/*
> +		 * This domain contains an SCU and cache-controller, and
> +		 * therefore it should only be turned off if the CPU cores are
> +		 * not in use.
> +		 */
> +		pr_debug("PM domain %s contains %s\n", name, "SCU");
> +		pd->flags |= PD_BUSY;
> +		gov = &pm_domain_always_on_gov;
> +	} else if (pd->flags & PD_NO_CR) {
> +		/*
> +		 * This domain cannot be turned off.
> +		 */
> +		pd->flags |= PD_BUSY;
> +		gov = &pm_domain_always_on_gov;
> +	}
> +
> +	genpd->power_off = rcar_sysc_pd_power_off;
> +	genpd->power_on = rcar_sysc_pd_power_on;
> +
> +	if (pd->flags & (PD_CPU | PD_NO_CR)) {
> +		/* Skip CPUs (handled by SMP code) and areas without control */
> +		pr_debug("%s: Not touching %s\n", __func__, genpd->name);
> +		goto finalize;
> +	}
> +
> +	if (!rcar_sysc_power_is_off(&pd->ch)) {
> +		pr_debug("%s: %s is already powered\n", __func__, genpd->name);
> +		goto finalize;
> +	}
> +
> +	rcar_sysc_power_up(&pd->ch);
> +
> +finalize:
> +	pm_genpd_init(genpd, gov, false);
> +}
> +
> +static const struct of_device_id rcar_sysc_matches[] = {
> +	{ /* sentinel */ }
> +};
> +
> +struct rcar_pm_domains {
> +	struct genpd_onecell_data onecell_data;
> +	struct generic_pm_domain *domains[RCAR_PD_ALWAYS_ON + 1];
> +};
> +
> +static int __init rcar_sysc_pd_init(void)
> +{
> +	const struct rcar_sysc_info *info;
> +	const struct of_device_id *match;
> +	struct rcar_pm_domains *domains;
> +	struct device_node *np;
> +	u32 syscier, syscimr;
> +	void __iomem *base;
> +	unsigned int i;
> +	int error;
> +
> +	np = of_find_matching_node_and_match(NULL, rcar_sysc_matches, &match);
> +	if (!np)
> +		return -ENODEV;
> +
> +	info = match->data;
> +
> +	base = of_iomap(np, 0);
> +	if (!base) {
> +		pr_warn("%s: Cannot map regs\n", np->full_name);
> +		error = -ENOMEM;
> +		goto out_put;
> +	}
> +
> +	rcar_sysc_base = base;
> +
> +	domains = kzalloc(sizeof(*domains), GFP_KERNEL);
> +	if (!domains) {
> +		error = -ENOMEM;
> +		goto out_put;
> +	}
> +
> +	domains->onecell_data.domains = domains->domains;
> +	domains->onecell_data.num_domains = ARRAY_SIZE(domains->domains);
> +
> +	for (i = 0, syscier = 0; i < info->num_areas; i++)
> +		syscier |= BIT(info->areas[i].isr_bit);
> +
> +	/*
> +	 * Mask all interrupt sources to prevent the CPU from receiving them.
> +	 * Make sure not to clear reserved bits that were set before.
> +	 */
> +	syscimr = ioread32(base + SYSCIMR);
> +	syscimr |= syscier;
> +	pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr);
> +	iowrite32(syscimr, base + SYSCIMR);
> +
> +	/*
> +	 * SYSC needs all interrupt sources enabled to control power.
> +	 */
> +	pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier);
> +	iowrite32(syscier, base + SYSCIER);
> +
> +	for (i = 0; i < info->num_areas; i++) {
> +		const struct rcar_sysc_area *area = &info->areas[i];
> +		struct rcar_sysc_pd *pd;
> +
> +		pd = kzalloc(sizeof(*pd) + strlen(area->name) + 1, GFP_KERNEL);
> +		if (!pd) {
> +			error = -ENOMEM;
> +			goto out_put;
> +		}
> +
> +		strcpy(pd->name, area->name);
> +		pd->genpd.name = pd->name;
> +		pd->ch.chan_offs = area->chan_offs;
> +		pd->ch.chan_bit = area->chan_bit;
> +		pd->ch.isr_bit = area->isr_bit;
> +		pd->flags = area->flags;
> +
> +		rcar_sysc_pd_setup(pd);
> +		if (area->parent >= 0)
> +			pm_genpd_add_subdomain(domains->domains[area->parent],
> +					       &pd->genpd);
> +
> +		domains->domains[area->isr_bit] = &pd->genpd;
> +	}
> +
> +	of_genpd_add_provider_onecell(np, &domains->onecell_data);
> +
> +out_put:
> +	of_node_put(np);
> +	return error;
> +}
> +early_initcall(rcar_sysc_pd_init);
> diff --git a/drivers/soc/renesas/rcar-sysc.h
> b/drivers/soc/renesas/rcar-sysc.h new file mode 100644
> index 0000000000000000..7bb48b4f7334f960
> --- /dev/null
> +++ b/drivers/soc/renesas/rcar-sysc.h
> @@ -0,0 +1,53 @@
> +/*
> + * Renesas R-Car System Controller
> + *
> + * Copyright (C) 2016 Glider bvba
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + */
> +#ifndef __SOC_RENESAS_RCAR_SYSC_H__
> +#define __SOC_RENESAS_RCAR_SYSC_H__
> +
> +#include <linux/types.h>
> +
> +
> +/*
> + * Power Domain flags
> + */
> +#define PD_CPU		BIT(0)	/* Area contains main CPU core */
> +#define PD_SCU		BIT(1)	/* Area contains SCU and L2 cache */
> +#define PD_NO_CR	BIT(2)	/* Area lacks PWR{ON,OFF}CR registers */
> +
> +#define PD_BUSY		BIT(3)	/* Busy, for internal use only */
> +
> +#define PD_CPU_CR	PD_CPU		  /* CPU area has CR (R-Car H1) */
> +#define PD_CPU_NOCR	PD_CPU | PD_NO_CR /* CPU area lacks CR (R-Car Gen2/3)
> */ +#define PD_ALWAYS_ON	PD_NO_CR	  /* Always-on area */
> +
> +
> +/*
> + * Description of a Power Area
> + */
> +
> +struct rcar_sysc_area {
> +	const char *name;
> +	u16 chan_offs;		/* Offset of PWRSR register for this area */
> +	u8 chan_bit;		/* Bit in PWR* (except for PWRUP in PWRSR) */
> +	u8 isr_bit;		/* Bit in SYSCI*R */
> +	int parent;		/* -1 if none */
> +	unsigned int flags;	/* See PD_* */
> +};
> +
> +
> +/*
> + * SoC-specific Power Area Description
> + */
> +
> +struct rcar_sysc_info {
> +	const struct rcar_sysc_area *areas;
> +	unsigned int num_areas;
> +};
> +
> +#endif /* __SOC_RENESAS_RCAR_SYSC_H__ */

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
  2016-04-20 12:02 ` Geert Uytterhoeven
@ 2016-04-21  3:28   ` Simon Horman
  -1 siblings, 0 replies; 48+ messages in thread
From: Simon Horman @ 2016-04-21  3:28 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Magnus Damm, Rafael J. Wysocki, Kevin Hilman, Ulf Hansson,
	Laurent Pinchart, linux-renesas-soc, linux-arm-kernel, linux-pm

On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> 	Hi Simon, Magnus,
> 
> This patch series introduces 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.
> 
> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> the VSPs are located in a PM Domain.
> 
> Changes compared to v5:
>   - Add Reviewed-by,
>   - Drop unneeded genpd->dev_ops.active_wakeup callback,
>   - Move call to pm_genpd_init() after all local initialization,
> 
> Changes compared to v4:
>   - Add Reviewed-by,
>   - Mask SYSC interrupts sources before enabling them (doesn't matter
>     much as they're disabled at the GIC level anyway),
>   - Reference r8a7791_sysc_info directly for R-Car M2-N in rcar-sysc.c,
>   - Re-add explicit "always-on" power area instead of aliasing the SoC's
>     Clock Domain,
>   - Add "always-on" power area on R-Car H1 and Gen2 SoCs,
>   - Merge the two initialization phases again,
>   - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks for Clock
>     Domain control,
>   - Drop dependency on r8a7795 of the Clock Domain handling, as this is
>     used for the "always-on" PM Domain on R-Car H1 and Gen2, too,
> 
> Changes compared to v3:
>   - Add Reviewed-by,
>   - Make sure not to clear reserved SYSCIMR bits that were set before,
>   - Make the always-on power area implicit and always present, and an
>     alias of the existing SoC's Clock Domain. This makes the number of
>     power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
>     and some checks.
>   - Split initialization in two phases,
>   - Remove the explicit dependency on the CPG/MSSR driver by forwarding
>     the attach/detach callbacks to the parent PM Domain.
>     If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
>     common genpd code later.
>   - Document that ARM cores are controlled by PSCI on R-Car Gen3
>     (although the underlying CPG/APMU hardware is the same as on Gen2),
>   - Drop R8A7779_PD_SH, as it's not documented in the datasheet,
>   - Rename R8A779*_PD_SH to R8A779*_PD_SH_4A, and "sh" to "sh-4a" on
>     R-Car Gen2,
>   - Remove always-on power area from the R-Car Gen3 table, as it's now
>     implicitly handled by the rcar-sysc driver,
>   - Reformat tables,
>   - Minor improvements (double evaluation, unused parameter, debug
>     message consolidation),
>   - Update MAINTAINERS.
> 
> Changes compared to v2:
>   - Add Reviewed-by,
>   - Rename driver from pm-rcar to rcar-sysc,
>   - Create PM Domains from hierarchy in C data instead of DT,
>   - Add support for an "always-on" domain, which is currently used on
>     R-Car H3 only (support can be added for other R-Car SoCs, preferably
>     after their migration to CPG/MSSR),
>   - Drop power area A3SH on R-Car H3, as it's no longer
>     documented in the datasheet, and touching it seems to crash SYSC,
>   - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
>     using our own copies,
>   - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
>     enabled to control power,
>   - Mask all SYSC interrupt sources for the CPU,
>   - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
>     enabled on R-Car SoCs,
>   - Use early_initcall() instead of core_initcall(),
>   - Do not power up CPU power areas during initialization, as this is
>     handled later (directly or indirectly) by the SMP code,
>   - Extract bindings into its own series, "[PATCH v3 0/7] PM / Domains:
>     Add DT bindings for the R-Car System Controller".
> 
> Changes compared to v1 (more details in the individual patches):
>   - Moved pm-rcar from arch/arm/mach-shmobile/ to drivers/soc/renesas/,
>   - Added R-Car H3 (r8a7795) support, incl. support for devices part of
>     a SYSC PM domain and the CPG/MSSR clock domain,
>   - Use "renesas,<type>-sysc" instead of "renesas,sysc-<type>",
>   - Added fallback compatibility strings for R-Car Gen2 and Gen3.
>   - Changed one-line summary prefix to match current arm-soc practices,
>   - The L2 cache-controller patches have been extracted into a separate
>     series ("[PATCH v3 0/7] ARM/arm64: dts: renesas: Add/complete L2
>     cache-controller nodes"),
>   - Minor fixes.
> 
> Dependencies:
>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
>     Controller").
> 
> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
> ugly rebase due to dropping the commits to reference both DMA
> controllers on R-Car Gen2.
> 
> For your convenience, I've pushed this, incl. all dependencies, to the
> topic/rcar-sysc-pd-v6 branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
> topic/gen3-latest branch.
> 
> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
> r8a7794/alt, and r8a7795/salvator-x.
> 
> Thanks!

Thanks. I am not planning to queue these up at this point.
Let me know if that is not what you expected.

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-21  3:28   ` Simon Horman
  0 siblings, 0 replies; 48+ messages in thread
From: Simon Horman @ 2016-04-21  3:28 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> 	Hi Simon, Magnus,
> 
> This patch series introduces 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.
> 
> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> the VSPs are located in a PM Domain.
> 
> Changes compared to v5:
>   - Add Reviewed-by,
>   - Drop unneeded genpd->dev_ops.active_wakeup callback,
>   - Move call to pm_genpd_init() after all local initialization,
> 
> Changes compared to v4:
>   - Add Reviewed-by,
>   - Mask SYSC interrupts sources before enabling them (doesn't matter
>     much as they're disabled at the GIC level anyway),
>   - Reference r8a7791_sysc_info directly for R-Car M2-N in rcar-sysc.c,
>   - Re-add explicit "always-on" power area instead of aliasing the SoC's
>     Clock Domain,
>   - Add "always-on" power area on R-Car H1 and Gen2 SoCs,
>   - Merge the two initialization phases again,
>   - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks for Clock
>     Domain control,
>   - Drop dependency on r8a7795 of the Clock Domain handling, as this is
>     used for the "always-on" PM Domain on R-Car H1 and Gen2, too,
> 
> Changes compared to v3:
>   - Add Reviewed-by,
>   - Make sure not to clear reserved SYSCIMR bits that were set before,
>   - Make the always-on power area implicit and always present, and an
>     alias of the existing SoC's Clock Domain. This makes the number of
>     power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
>     and some checks.
>   - Split initialization in two phases,
>   - Remove the explicit dependency on the CPG/MSSR driver by forwarding
>     the attach/detach callbacks to the parent PM Domain.
>     If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
>     common genpd code later.
>   - Document that ARM cores are controlled by PSCI on R-Car Gen3
>     (although the underlying CPG/APMU hardware is the same as on Gen2),
>   - Drop R8A7779_PD_SH, as it's not documented in the datasheet,
>   - Rename R8A779*_PD_SH to R8A779*_PD_SH_4A, and "sh" to "sh-4a" on
>     R-Car Gen2,
>   - Remove always-on power area from the R-Car Gen3 table, as it's now
>     implicitly handled by the rcar-sysc driver,
>   - Reformat tables,
>   - Minor improvements (double evaluation, unused parameter, debug
>     message consolidation),
>   - Update MAINTAINERS.
> 
> Changes compared to v2:
>   - Add Reviewed-by,
>   - Rename driver from pm-rcar to rcar-sysc,
>   - Create PM Domains from hierarchy in C data instead of DT,
>   - Add support for an "always-on" domain, which is currently used on
>     R-Car H3 only (support can be added for other R-Car SoCs, preferably
>     after their migration to CPG/MSSR),
>   - Drop power area A3SH on R-Car H3, as it's no longer
>     documented in the datasheet, and touching it seems to crash SYSC,
>   - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
>     using our own copies,
>   - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
>     enabled to control power,
>   - Mask all SYSC interrupt sources for the CPU,
>   - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
>     enabled on R-Car SoCs,
>   - Use early_initcall() instead of core_initcall(),
>   - Do not power up CPU power areas during initialization, as this is
>     handled later (directly or indirectly) by the SMP code,
>   - Extract bindings into its own series, "[PATCH v3 0/7] PM / Domains:
>     Add DT bindings for the R-Car System Controller".
> 
> Changes compared to v1 (more details in the individual patches):
>   - Moved pm-rcar from arch/arm/mach-shmobile/ to drivers/soc/renesas/,
>   - Added R-Car H3 (r8a7795) support, incl. support for devices part of
>     a SYSC PM domain and the CPG/MSSR clock domain,
>   - Use "renesas,<type>-sysc" instead of "renesas,sysc-<type>",
>   - Added fallback compatibility strings for R-Car Gen2 and Gen3.
>   - Changed one-line summary prefix to match current arm-soc practices,
>   - The L2 cache-controller patches have been extracted into a separate
>     series ("[PATCH v3 0/7] ARM/arm64: dts: renesas: Add/complete L2
>     cache-controller nodes"),
>   - Minor fixes.
> 
> Dependencies:
>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
>     Controller").
> 
> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
> ugly rebase due to dropping the commits to reference both DMA
> controllers on R-Car Gen2.
> 
> For your convenience, I've pushed this, incl. all dependencies, to the
> topic/rcar-sysc-pd-v6 branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
> topic/gen3-latest branch.
> 
> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
> r8a7794/alt, and r8a7795/salvator-x.
> 
> Thanks!

Thanks. I am not planning to queue these up at this point.
Let me know if that is not what you expected.

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
  2016-04-21  3:28   ` Simon Horman
@ 2016-04-21 15:14     ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-21 15:14 UTC (permalink / raw)
  To: Simon Horman
  Cc: Geert Uytterhoeven, Magnus Damm, Rafael J. Wysocki, Kevin Hilman,
	Ulf Hansson, Laurent Pinchart, linux-renesas-soc,
	linux-arm-kernel, Linux PM list

Hi Simon,

On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
>> This patch series introduces 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.
>>
>> This is a dependency for the enablement of DU and VSP on R-Car H3, as
>> the VSPs are located in a PM Domain.

[...]

>> Dependencies:
>>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
>>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
>>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
>>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
>>     Controller").
>>
>> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
>> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
>> ugly rebase due to dropping the commits to reference both DMA
>> controllers on R-Car Gen2.
>>
>> For your convenience, I've pushed this, incl. all dependencies, to the
>> topic/rcar-sysc-pd-v6 branch of
>> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
>> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
>> topic/gen3-latest branch.
>>
>> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
>> r8a7794/alt, and r8a7795/salvator-x.
>>
>> Thanks!
>
> Thanks. I am not planning to queue these up at this point.
> Let me know if that is not what you expected.

As the clock maintainers has merged the preparatory clock work, and pushed
it out into clk-next, you can now:
  1. Pull the preparatory clock work in your tree, i.e. pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
tags/clk-renesas-for-v4.7-tag2

  2. Apply this series.

After that,
  3. I will rebase and update "[PATCH v5 00/12] ARM/arm64: dts: rcar: Add SYSC
     PM domains" to match your current dt-for-v4.7 and arm64-dt-for-v4.7 (for
     dmas/dma-names changes and recently added mmc and sdhi nodes),
     and send it out,
  4. You can apply it to a branch containing all of the above as prerequisites.

Is that OK for you?

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-21 15:14     ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-21 15:14 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
>> This patch series introduces 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.
>>
>> This is a dependency for the enablement of DU and VSP on R-Car H3, as
>> the VSPs are located in a PM Domain.

[...]

>> Dependencies:
>>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
>>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
>>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
>>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
>>     Controller").
>>
>> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
>> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
>> ugly rebase due to dropping the commits to reference both DMA
>> controllers on R-Car Gen2.
>>
>> For your convenience, I've pushed this, incl. all dependencies, to the
>> topic/rcar-sysc-pd-v6 branch of
>> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
>> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
>> topic/gen3-latest branch.
>>
>> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
>> r8a7794/alt, and r8a7795/salvator-x.
>>
>> Thanks!
>
> Thanks. I am not planning to queue these up at this point.
> Let me know if that is not what you expected.

As the clock maintainers has merged the preparatory clock work, and pushed
it out into clk-next, you can now:
  1. Pull the preparatory clock work in your tree, i.e. pull from:

        git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
tags/clk-renesas-for-v4.7-tag2

  2. Apply this series.

After that,
  3. I will rebase and update "[PATCH v5 00/12] ARM/arm64: dts: rcar: Add SYSC
     PM domains" to match your current dt-for-v4.7 and arm64-dt-for-v4.7 (for
     dmas/dma-names changes and recently added mmc and sdhi nodes),
     and send it out,
  4. You can apply it to a branch containing all of the above as prerequisites.

Is that OK for you?

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
  2016-04-21 15:14     ` Geert Uytterhoeven
@ 2016-04-22  0:33       ` Simon Horman
  -1 siblings, 0 replies; 48+ messages in thread
From: Simon Horman @ 2016-04-22  0:33 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Geert Uytterhoeven, Magnus Damm, Rafael J. Wysocki, Kevin Hilman,
	Ulf Hansson, Laurent Pinchart, linux-renesas-soc,
	linux-arm-kernel, Linux PM list

On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >> This patch series introduces 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.
> >>
> >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> >> the VSPs are located in a PM Domain.
> 
> [...]
> 
> >> Dependencies:
> >>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
> >>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
> >>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
> >>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
> >>     Controller").
> >>
> >> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
> >> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
> >> ugly rebase due to dropping the commits to reference both DMA
> >> controllers on R-Car Gen2.
> >>
> >> For your convenience, I've pushed this, incl. all dependencies, to the
> >> topic/rcar-sysc-pd-v6 branch of
> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
> >> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
> >> topic/gen3-latest branch.
> >>
> >> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
> >> r8a7794/alt, and r8a7795/salvator-x.
> >>
> >> Thanks!
> >
> > Thanks. I am not planning to queue these up at this point.
> > Let me know if that is not what you expected.
> 
> As the clock maintainers has merged the preparatory clock work, and pushed
> it out into clk-next, you can now:
>   1. Pull the preparatory clock work in your tree, i.e. pull from:
> 
>         git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> tags/clk-renesas-for-v4.7-tag2

To my mind I need some kind of assurance from the clk maintainers that the
patches are stable there - in particular that the commit ids won't change.
And that both they and the ARM-SoC maintainers are happy with me pulling
it into my tree for this purpose.

I do wonder, as we are almost at the closing point for queuing up changes
for v4.7 if, assuming the above patches are scheduled for inclusion in
v4.7-rc1, it might not be better for me to queue up this series for v4.8.

I could do that sooner rather than later in the devel branch of the renesas
tree if you like.

>   2. Apply this series.
> 
> After that,
>   3. I will rebase and update "[PATCH v5 00/12] ARM/arm64: dts: rcar: Add SYSC
>      PM domains" to match your current dt-for-v4.7 and arm64-dt-for-v4.7 (for
>      dmas/dma-names changes and recently added mmc and sdhi nodes),
>      and send it out,
>   4. You can apply it to a branch containing all of the above as prerequisites.
> 
> Is that OK for you?
> 
> Thanks!
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-22  0:33       ` Simon Horman
  0 siblings, 0 replies; 48+ messages in thread
From: Simon Horman @ 2016-04-22  0:33 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >> This patch series introduces 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.
> >>
> >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> >> the VSPs are located in a PM Domain.
> 
> [...]
> 
> >> Dependencies:
> >>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
> >>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
> >>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
> >>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
> >>     Controller").
> >>
> >> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
> >> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
> >> ugly rebase due to dropping the commits to reference both DMA
> >> controllers on R-Car Gen2.
> >>
> >> For your convenience, I've pushed this, incl. all dependencies, to the
> >> topic/rcar-sysc-pd-v6 branch of
> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
> >> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
> >> topic/gen3-latest branch.
> >>
> >> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
> >> r8a7794/alt, and r8a7795/salvator-x.
> >>
> >> Thanks!
> >
> > Thanks. I am not planning to queue these up at this point.
> > Let me know if that is not what you expected.
> 
> As the clock maintainers has merged the preparatory clock work, and pushed
> it out into clk-next, you can now:
>   1. Pull the preparatory clock work in your tree, i.e. pull from:
> 
>         git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> tags/clk-renesas-for-v4.7-tag2

To my mind I need some kind of assurance from the clk maintainers that the
patches are stable there - in particular that the commit ids won't change.
And that both they and the ARM-SoC maintainers are happy with me pulling
it into my tree for this purpose.

I do wonder, as we are almost at the closing point for queuing up changes
for v4.7 if, assuming the above patches are scheduled for inclusion in
v4.7-rc1, it might not be better for me to queue up this series for v4.8.

I could do that sooner rather than later in the devel branch of the renesas
tree if you like.

>   2. Apply this series.
> 
> After that,
>   3. I will rebase and update "[PATCH v5 00/12] ARM/arm64: dts: rcar: Add SYSC
>      PM domains" to match your current dt-for-v4.7 and arm64-dt-for-v4.7 (for
>      dmas/dma-names changes and recently added mmc and sdhi nodes),
>      and send it out,
>   4. You can apply it to a branch containing all of the above as prerequisites.
> 
> Is that OK for you?
> 
> Thanks!
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
  2016-04-22  0:33       ` Simon Horman
@ 2016-04-22  4:12         ` Laurent Pinchart
  -1 siblings, 0 replies; 48+ messages in thread
From: Laurent Pinchart @ 2016-04-22  4:12 UTC (permalink / raw)
  To: Simon Horman
  Cc: Geert Uytterhoeven, Geert Uytterhoeven, Magnus Damm,
	Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, linux-renesas-soc,
	linux-arm-kernel, Linux PM list

Hi Simon,

On Friday 22 Apr 2016 10:33:11 Simon Horman wrote:
> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> > On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> > > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> > >> This patch series introduces 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.
> > >> 
> > >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> > >> the VSPs are located in a PM Domain.
> > 
> > [...]
> > 
> > >> Dependencies:
> > >>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
> > >>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
> > >>   
> > >>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
> > >>   
> > >>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
> > >>     Controller").
> > >> 
> > >> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
> > >> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
> > >> ugly rebase due to dropping the commits to reference both DMA
> > >> controllers on R-Car Gen2.
> > >> 
> > >> For your convenience, I've pushed this, incl. all dependencies, to the
> > >> topic/rcar-sysc-pd-v6 branch of
> > >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> > >> .
> > >> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in
> > >> the
> > >> topic/gen3-latest branch.
> > >> 
> > >> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
> > >> r8a7794/alt, and r8a7795/salvator-x.
> > >> 
> > >> Thanks!
> > > 
> > > Thanks. I am not planning to queue these up at this point.
> > > Let me know if that is not what you expected.
> > 
> > As the clock maintainers has merged the preparatory clock work, and pushed
> > 
> > it out into clk-next, you can now:
> >   1. Pull the preparatory clock work in your tree, i.e. pull from:
> >         git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-driver
> >         s.git
> > 
> > tags/clk-renesas-for-v4.7-tag2
> 
> To my mind I need some kind of assurance from the clk maintainers that the
> patches are stable there - in particular that the commit ids won't change.
> And that both they and the ARM-SoC maintainers are happy with me pulling
> it into my tree for this purpose.
> 
> I do wonder, as we are almost at the closing point for queuing up changes
> for v4.7 if, assuming the above patches are scheduled for inclusion in
> v4.7-rc1, it might not be better for me to queue up this series for v4.8.

Then that would delay a bunch of multimedia patch by one more kernel cycle, 
which I was hoping to avoid.

> I could do that sooner rather than later in the devel branch of the renesas
> tree if you like.
> 
> >   2. Apply this series.
> > 
> > After that,
> > 
> >   3. I will rebase and update "[PATCH v5 00/12] ARM/arm64: dts: rcar: Add
> >   SYSC>   
> >      PM domains" to match your current dt-for-v4.7 and arm64-dt-for-v4.7
> >      (for
> >      dmas/dma-names changes and recently added mmc and sdhi nodes),
> >      and send it out,
> >   
> >   4. You can apply it to a branch containing all of the above as
> >   prerequisites.> 
> > Is that OK for you?

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-22  4:12         ` Laurent Pinchart
  0 siblings, 0 replies; 48+ messages in thread
From: Laurent Pinchart @ 2016-04-22  4:12 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

On Friday 22 Apr 2016 10:33:11 Simon Horman wrote:
> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> > On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> > > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> > >> This patch series introduces 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.
> > >> 
> > >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> > >> the VSPs are located in a PM Domain.
> > 
> > [...]
> > 
> > >> Dependencies:
> > >>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
> > >>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
> > >>   
> > >>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
> > >>   
> > >>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
> > >>     Controller").
> > >> 
> > >> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
> > >> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
> > >> ugly rebase due to dropping the commits to reference both DMA
> > >> controllers on R-Car Gen2.
> > >> 
> > >> For your convenience, I've pushed this, incl. all dependencies, to the
> > >> topic/rcar-sysc-pd-v6 branch of
> > >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> > >> .
> > >> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in
> > >> the
> > >> topic/gen3-latest branch.
> > >> 
> > >> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
> > >> r8a7794/alt, and r8a7795/salvator-x.
> > >> 
> > >> Thanks!
> > > 
> > > Thanks. I am not planning to queue these up at this point.
> > > Let me know if that is not what you expected.
> > 
> > As the clock maintainers has merged the preparatory clock work, and pushed
> > 
> > it out into clk-next, you can now:
> >   1. Pull the preparatory clock work in your tree, i.e. pull from:
> >         git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-driver
> >         s.git
> > 
> > tags/clk-renesas-for-v4.7-tag2
> 
> To my mind I need some kind of assurance from the clk maintainers that the
> patches are stable there - in particular that the commit ids won't change.
> And that both they and the ARM-SoC maintainers are happy with me pulling
> it into my tree for this purpose.
> 
> I do wonder, as we are almost at the closing point for queuing up changes
> for v4.7 if, assuming the above patches are scheduled for inclusion in
> v4.7-rc1, it might not be better for me to queue up this series for v4.8.

Then that would delay a bunch of multimedia patch by one more kernel cycle, 
which I was hoping to avoid.

> I could do that sooner rather than later in the devel branch of the renesas
> tree if you like.
> 
> >   2. Apply this series.
> > 
> > After that,
> > 
> >   3. I will rebase and update "[PATCH v5 00/12] ARM/arm64: dts: rcar: Add
> >   SYSC>   
> >      PM domains" to match your current dt-for-v4.7 and arm64-dt-for-v4.7
> >      (for
> >      dmas/dma-names changes and recently added mmc and sdhi nodes),
> >      and send it out,
> >   
> >   4. You can apply it to a branch containing all of the above as
> >   prerequisites.> 
> > Is that OK for you?

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
  2016-04-22  0:33       ` Simon Horman
@ 2016-04-22  7:02         ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-22  7:02 UTC (permalink / raw)
  To: Simon Horman
  Cc: Geert Uytterhoeven, Magnus Damm, Rafael J. Wysocki, Kevin Hilman,
	Ulf Hansson, Laurent Pinchart, linux-renesas-soc,
	linux-arm-kernel, Linux PM list

Hi Simon,

On Fri, Apr 22, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
>> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
>> > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
>> >> This patch series introduces 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.
>> >>
>> >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
>> >> the VSPs are located in a PM Domain.
>>
>> [...]
>>
>> >> Dependencies:
>> >>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
>> >>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
>> >>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
>> >>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
>> >>     Controller").
>> >>
>> >> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
>> >> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
>> >> ugly rebase due to dropping the commits to reference both DMA
>> >> controllers on R-Car Gen2.
>> >>
>> >> For your convenience, I've pushed this, incl. all dependencies, to the
>> >> topic/rcar-sysc-pd-v6 branch of
>> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
>> >> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
>> >> topic/gen3-latest branch.
>> >>
>> >> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
>> >> r8a7794/alt, and r8a7795/salvator-x.
>> >>
>> >> Thanks!
>> >
>> > Thanks. I am not planning to queue these up at this point.
>> > Let me know if that is not what you expected.
>>
>> As the clock maintainers has merged the preparatory clock work, and pushed
>> it out into clk-next, you can now:
>>   1. Pull the preparatory clock work in your tree, i.e. pull from:
>>
>>         git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
>> tags/clk-renesas-for-v4.7-tag2
>
> To my mind I need some kind of assurance from the clk maintainers that the
> patches are stable there - in particular that the commit ids won't change.

As the clock maintainer pulled the same tag instead of applying emailed
patches, the commit IDs won't change, even if he has to rework the clk-next
branch and repull.

> And that both they and the ARM-SoC maintainers are happy with me pulling
> it into my tree for this purpose.

I also mentioned that in the pull request. Pulling in a stable branch is
standard procedure: the code fails to compile if you don't merge
tags/clk-renesas-for-v4.7-tag2 first.

> I do wonder, as we are almost at the closing point for queuing up changes
> for v4.7 if, assuming the above patches are scheduled for inclusion in
> v4.7-rc1, it might not be better for me to queue up this series for v4.8.
>
> I could do that sooner rather than later in the devel branch of the renesas
> tree if you like.

v4.7-rc1 is still more than one month in the future.

As Laurent said, that would delay multimedia work by one more kernel cycle,
as R-Car SYSC PM Domains already missed v4.6.
In addition, it would mean continued rebasing/updating of "[PATCH v5 00/12]
ARM/arm64: dts: rcar: Add SYSC PM domains" in renesas-drivers, as it touches
all R-Car DTSes all over the place.

Thanks for reconsidering!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-22  7:02         ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-22  7:02 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

On Fri, Apr 22, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote:
> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
>> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
>> > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
>> >> This patch series introduces 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.
>> >>
>> >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
>> >> the VSPs are located in a PM Domain.
>>
>> [...]
>>
>> >> Dependencies:
>> >>   - clk-renesas-for-v4.7 (which now includes "[PATCH v2 0/4] clk:
>> >>     renesas: R-Car SYSC PM Domain Preparation"; pull request sent),
>> >>   - renesas-devel-20160420-v4.6-rc4 (which already contains series
>> >>     "[PATCH v5 0/7] PM / Domains: Add DT bindings for the R-Car System
>> >>     Controller").
>> >>
>> >> I won't be resending follow-up series "[PATCH v5 00/12] ARM/arm64: dts:
>> >> rcar: Add SYSC PM domains" for now, as it's unchanged, except for an
>> >> ugly rebase due to dropping the commits to reference both DMA
>> >> controllers on R-Car Gen2.
>> >>
>> >> For your convenience, I've pushed this, incl. all dependencies, to the
>> >> topic/rcar-sysc-pd-v6 branch of
>> >> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
>> >> Integration with renesas-drivers-2016-04-12-v4.6-rc3 is available in the
>> >> topic/gen3-latest branch.
>> >>
>> >> This has been tested on r8a7779/marzen, r8a7790/lager, r8a7791/koelsch,
>> >> r8a7794/alt, and r8a7795/salvator-x.
>> >>
>> >> Thanks!
>> >
>> > Thanks. I am not planning to queue these up at this point.
>> > Let me know if that is not what you expected.
>>
>> As the clock maintainers has merged the preparatory clock work, and pushed
>> it out into clk-next, you can now:
>>   1. Pull the preparatory clock work in your tree, i.e. pull from:
>>
>>         git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
>> tags/clk-renesas-for-v4.7-tag2
>
> To my mind I need some kind of assurance from the clk maintainers that the
> patches are stable there - in particular that the commit ids won't change.

As the clock maintainer pulled the same tag instead of applying emailed
patches, the commit IDs won't change, even if he has to rework the clk-next
branch and repull.

> And that both they and the ARM-SoC maintainers are happy with me pulling
> it into my tree for this purpose.

I also mentioned that in the pull request. Pulling in a stable branch is
standard procedure: the code fails to compile if you don't merge
tags/clk-renesas-for-v4.7-tag2 first.

> I do wonder, as we are almost at the closing point for queuing up changes
> for v4.7 if, assuming the above patches are scheduled for inclusion in
> v4.7-rc1, it might not be better for me to queue up this series for v4.8.
>
> I could do that sooner rather than later in the devel branch of the renesas
> tree if you like.

v4.7-rc1 is still more than one month in the future.

As Laurent said, that would delay multimedia work by one more kernel cycle,
as R-Car SYSC PM Domains already missed v4.6.
In addition, it would mean continued rebasing/updating of "[PATCH v5 00/12]
ARM/arm64: dts: rcar: Add SYSC PM domains" in renesas-drivers, as it touches
all R-Car DTSes all over the place.

Thanks for reconsidering!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
  2016-04-20 12:02   ` Geert Uytterhoeven
@ 2016-04-22  7:21     ` Ulf Hansson
  -1 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2016-04-22  7:21 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Simon Horman, Magnus Damm, Rafael J. Wysocki, Kevin Hilman,
	Laurent Pinchart, linux-renesas-soc, linux-arm-kernel, linux-pm

On 20 April 2016 at 14:02, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> Populate the SYSC PM domains from DT, based on the presence of a device
> node for the System Controller. The actual power area hiearchy, and
> features of specific areas are obtained from tables in the C code.
>
> The SYSCIER and SYSCIMR register values are derived from the power areas
> present, which will help to get rid of the hardcoded values in R-Car H1
> and R-Car Gen2 platform code later.
>
> Initialization is done from an early_initcall(), to make sure the PM
> Domains are initialized before secondary CPU bringup.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

> ---
> v6:
>   - Drop unneeded genpd->dev_ops.active_wakeup callback,
>   - Move call to pm_genpd_init() after all local initialization,
>
> v5:
>   - Mask SYSC interrupts sources before enabling them (doesn't matter
>     much as they're disabled at the GIC level anyway),
>   - Re-add explicit "always-on" power area instead of aliasing the SoC's
>     Clock Domain,
>   - Merge the two initialization phases again,
>
> v4:
>   - Make sure not to clear reserved SYSCIMR bits that were set before,
>   - Make the always-on power area implicit and always present, and an
>     alias of the existing SoC's Clock Domain. This makes the number of
>     power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
>     and some checks.
>   - Split initialization in two phases,
>   - Document that ARM cores are controlled by PSCI on R-Car Gen3
>     (although the underlying CPG/APMU hardware is the same as on Gen2),
>   - Minor improvements (double evaluation, unused parameter, debug
>     message consolidation),
>
> v3:
>   - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
>     enabled on R-Car SoCs,
>   - Create PM Domains from hierarchy in C data instead of DT,
>   - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
>     enabled to control power,
>   - Mask all SYSC interrupt sources for the CPU,
>   - Add support for an "always-on" domain,
>   - Use early_initcall() instead of core_initcall(),
>   - Do not power up CPU power areas during initialization, as this is
>     handled later (directly or indirectly) by the SMP code,
>
> v2:
>   - Add missing definitions for SYSC_PWR_CA15_CPU and SYSC_PWR_CA7_CPU,
>   - Add R-Car H3 (r8a7795) support,
>   - Drop tests for CONFIG_ARCH_SHMOBILE_LEGACY,
>   - Add missing break statements in rcar_sysc_pwr_on_off(),
>   - Add missing calls to of_node_put() in error paths,
>   - Fix build if CONFIG_PM=n,
>   - Update compatible values,
>   - Update copyright.
> ---
>  drivers/soc/renesas/rcar-sysc.c | 202 +++++++++++++++++++++++++++++++++++++++-
>  drivers/soc/renesas/rcar-sysc.h |  53 +++++++++++
>  2 files changed, 254 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/soc/renesas/rcar-sysc.h
>
> diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
> index 9ba5fd15c53bf9b9..95f2b59cbd76f777 100644
> --- a/drivers/soc/renesas/rcar-sysc.c
> +++ b/drivers/soc/renesas/rcar-sysc.c
> @@ -2,6 +2,7 @@
>   * R-Car SYSC Power management support
>   *
>   * Copyright (C) 2014  Magnus Damm
> + * Copyright (C) 2015-2016 Glider bvba
>   *
>   * This file is subject to the terms and conditions of the GNU General Public
>   * License.  See the file "COPYING" in the main directory of this archive
> @@ -11,10 +12,15 @@
>  #include <linux/delay.h>
>  #include <linux/err.h>
>  #include <linux/mm.h>
> +#include <linux/of_address.h>
> +#include <linux/pm_domain.h>
> +#include <linux/slab.h>
>  #include <linux/spinlock.h>
>  #include <linux/io.h>
>  #include <linux/soc/renesas/rcar-sysc.h>
>
> +#include "rcar-sysc.h"
> +
>  /* SYSC Common */
>  #define SYSCSR                 0x00    /* SYSC Status Register */
>  #define SYSCISR                        0x04    /* Interrupt Status Register */
> @@ -29,7 +35,8 @@
>  /*
>   * Power Control Register Offsets inside the register block for each domain
>   * Note: The "CR" registers for ARM cores exist on H1 only
> - *       Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *      Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *      Use PSCI on R-Car Gen3
>   */
>  #define PWRSR_OFFS             0x00    /* Power Status Register */
>  #define PWROFFCR_OFFS          0x04    /* Power Shutoff Control Register */
> @@ -48,6 +55,8 @@
>  #define SYSCISR_RETRIES                1000
>  #define SYSCISR_DELAY_US       1
>
> +#define RCAR_PD_ALWAYS_ON      32      /* Always-on power area */
> +
>  static void __iomem *rcar_sysc_base;
>  static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
>
> @@ -162,3 +171,194 @@ void __iomem *rcar_sysc_init(phys_addr_t base)
>
>         return rcar_sysc_base;
>  }
> +
> +struct rcar_sysc_pd {
> +       struct generic_pm_domain genpd;
> +       struct rcar_sysc_ch ch;
> +       unsigned int flags;
> +       char name[0];
> +};
> +
> +static inline struct rcar_sysc_pd *to_rcar_pd(struct generic_pm_domain *d)
> +{
> +       return container_of(d, struct rcar_sysc_pd, genpd);
> +}
> +
> +static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd)
> +{
> +       struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +       pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +       if (pd->flags & PD_NO_CR) {
> +               pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +               return -EBUSY;
> +       }
> +
> +       if (pd->flags & PD_BUSY) {
> +               pr_debug("%s: %s busy\n", __func__, genpd->name);
> +               return -EBUSY;
> +       }
> +
> +       return rcar_sysc_power_down(&pd->ch);
> +}
> +
> +static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
> +{
> +       struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +       pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +       if (pd->flags & PD_NO_CR) {
> +               pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +               return 0;
> +       }
> +
> +       return rcar_sysc_power_up(&pd->ch);
> +}
> +
> +static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
> +{
> +       struct generic_pm_domain *genpd = &pd->genpd;
> +       const char *name = pd->genpd.name;
> +       struct dev_power_governor *gov = &simple_qos_governor;
> +
> +       if (pd->flags & PD_CPU) {
> +               /*
> +                * This domain contains a CPU core and therefore it should
> +                * only be turned off if the CPU is not in use.
> +                */
> +               pr_debug("PM domain %s contains %s\n", name, "CPU");
> +               pd->flags |= PD_BUSY;
> +               gov = &pm_domain_always_on_gov;
> +       } else if (pd->flags & PD_SCU) {
> +               /*
> +                * This domain contains an SCU and cache-controller, and
> +                * therefore it should only be turned off if the CPU cores are
> +                * not in use.
> +                */
> +               pr_debug("PM domain %s contains %s\n", name, "SCU");
> +               pd->flags |= PD_BUSY;
> +               gov = &pm_domain_always_on_gov;
> +       } else if (pd->flags & PD_NO_CR) {
> +               /*
> +                * This domain cannot be turned off.
> +                */
> +               pd->flags |= PD_BUSY;
> +               gov = &pm_domain_always_on_gov;
> +       }
> +
> +       genpd->power_off = rcar_sysc_pd_power_off;
> +       genpd->power_on = rcar_sysc_pd_power_on;
> +
> +       if (pd->flags & (PD_CPU | PD_NO_CR)) {
> +               /* Skip CPUs (handled by SMP code) and areas without control */
> +               pr_debug("%s: Not touching %s\n", __func__, genpd->name);
> +               goto finalize;
> +       }
> +
> +       if (!rcar_sysc_power_is_off(&pd->ch)) {
> +               pr_debug("%s: %s is already powered\n", __func__, genpd->name);
> +               goto finalize;
> +       }
> +
> +       rcar_sysc_power_up(&pd->ch);
> +
> +finalize:
> +       pm_genpd_init(genpd, gov, false);
> +}
> +
> +static const struct of_device_id rcar_sysc_matches[] = {
> +       { /* sentinel */ }
> +};
> +
> +struct rcar_pm_domains {
> +       struct genpd_onecell_data onecell_data;
> +       struct generic_pm_domain *domains[RCAR_PD_ALWAYS_ON + 1];
> +};
> +
> +static int __init rcar_sysc_pd_init(void)
> +{
> +       const struct rcar_sysc_info *info;
> +       const struct of_device_id *match;
> +       struct rcar_pm_domains *domains;
> +       struct device_node *np;
> +       u32 syscier, syscimr;
> +       void __iomem *base;
> +       unsigned int i;
> +       int error;
> +
> +       np = of_find_matching_node_and_match(NULL, rcar_sysc_matches, &match);
> +       if (!np)
> +               return -ENODEV;
> +
> +       info = match->data;
> +
> +       base = of_iomap(np, 0);
> +       if (!base) {
> +               pr_warn("%s: Cannot map regs\n", np->full_name);
> +               error = -ENOMEM;
> +               goto out_put;
> +       }
> +
> +       rcar_sysc_base = base;
> +
> +       domains = kzalloc(sizeof(*domains), GFP_KERNEL);
> +       if (!domains) {
> +               error = -ENOMEM;
> +               goto out_put;
> +       }
> +
> +       domains->onecell_data.domains = domains->domains;
> +       domains->onecell_data.num_domains = ARRAY_SIZE(domains->domains);
> +
> +       for (i = 0, syscier = 0; i < info->num_areas; i++)
> +               syscier |= BIT(info->areas[i].isr_bit);
> +
> +       /*
> +        * Mask all interrupt sources to prevent the CPU from receiving them.
> +        * Make sure not to clear reserved bits that were set before.
> +        */
> +       syscimr = ioread32(base + SYSCIMR);
> +       syscimr |= syscier;
> +       pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr);
> +       iowrite32(syscimr, base + SYSCIMR);
> +
> +       /*
> +        * SYSC needs all interrupt sources enabled to control power.
> +        */
> +       pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier);
> +       iowrite32(syscier, base + SYSCIER);
> +
> +       for (i = 0; i < info->num_areas; i++) {
> +               const struct rcar_sysc_area *area = &info->areas[i];
> +               struct rcar_sysc_pd *pd;
> +
> +               pd = kzalloc(sizeof(*pd) + strlen(area->name) + 1, GFP_KERNEL);
> +               if (!pd) {
> +                       error = -ENOMEM;
> +                       goto out_put;
> +               }
> +
> +               strcpy(pd->name, area->name);
> +               pd->genpd.name = pd->name;
> +               pd->ch.chan_offs = area->chan_offs;
> +               pd->ch.chan_bit = area->chan_bit;
> +               pd->ch.isr_bit = area->isr_bit;
> +               pd->flags = area->flags;
> +
> +               rcar_sysc_pd_setup(pd);
> +               if (area->parent >= 0)
> +                       pm_genpd_add_subdomain(domains->domains[area->parent],
> +                                              &pd->genpd);
> +
> +               domains->domains[area->isr_bit] = &pd->genpd;
> +       }
> +
> +       of_genpd_add_provider_onecell(np, &domains->onecell_data);
> +
> +out_put:
> +       of_node_put(np);
> +       return error;
> +}
> +early_initcall(rcar_sysc_pd_init);
> diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
> new file mode 100644
> index 0000000000000000..7bb48b4f7334f960
> --- /dev/null
> +++ b/drivers/soc/renesas/rcar-sysc.h
> @@ -0,0 +1,53 @@
> +/*
> + * Renesas R-Car System Controller
> + *
> + * Copyright (C) 2016 Glider bvba
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + */
> +#ifndef __SOC_RENESAS_RCAR_SYSC_H__
> +#define __SOC_RENESAS_RCAR_SYSC_H__
> +
> +#include <linux/types.h>
> +
> +
> +/*
> + * Power Domain flags
> + */
> +#define PD_CPU         BIT(0)  /* Area contains main CPU core */
> +#define PD_SCU         BIT(1)  /* Area contains SCU and L2 cache */
> +#define PD_NO_CR       BIT(2)  /* Area lacks PWR{ON,OFF}CR registers */
> +
> +#define PD_BUSY                BIT(3)  /* Busy, for internal use only */
> +
> +#define PD_CPU_CR      PD_CPU            /* CPU area has CR (R-Car H1) */
> +#define PD_CPU_NOCR    PD_CPU | PD_NO_CR /* CPU area lacks CR (R-Car Gen2/3) */
> +#define PD_ALWAYS_ON   PD_NO_CR          /* Always-on area */
> +
> +
> +/*
> + * Description of a Power Area
> + */
> +
> +struct rcar_sysc_area {
> +       const char *name;
> +       u16 chan_offs;          /* Offset of PWRSR register for this area */
> +       u8 chan_bit;            /* Bit in PWR* (except for PWRUP in PWRSR) */
> +       u8 isr_bit;             /* Bit in SYSCI*R */
> +       int parent;             /* -1 if none */
> +       unsigned int flags;     /* See PD_* */
> +};
> +
> +
> +/*
> + * SoC-specific Power Area Description
> + */
> +
> +struct rcar_sysc_info {
> +       const struct rcar_sysc_area *areas;
> +       unsigned int num_areas;
> +};
> +
> +#endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
> --
> 1.9.1
>

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains
@ 2016-04-22  7:21     ` Ulf Hansson
  0 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2016-04-22  7:21 UTC (permalink / raw)
  To: linux-arm-kernel

On 20 April 2016 at 14:02, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> Populate the SYSC PM domains from DT, based on the presence of a device
> node for the System Controller. The actual power area hiearchy, and
> features of specific areas are obtained from tables in the C code.
>
> The SYSCIER and SYSCIMR register values are derived from the power areas
> present, which will help to get rid of the hardcoded values in R-Car H1
> and R-Car Gen2 platform code later.
>
> Initialization is done from an early_initcall(), to make sure the PM
> Domains are initialized before secondary CPU bringup.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

> ---
> v6:
>   - Drop unneeded genpd->dev_ops.active_wakeup callback,
>   - Move call to pm_genpd_init() after all local initialization,
>
> v5:
>   - Mask SYSC interrupts sources before enabling them (doesn't matter
>     much as they're disabled at the GIC level anyway),
>   - Re-add explicit "always-on" power area instead of aliasing the SoC's
>     Clock Domain,
>   - Merge the two initialization phases again,
>
> v4:
>   - Make sure not to clear reserved SYSCIMR bits that were set before,
>   - Make the always-on power area implicit and always present, and an
>     alias of the existing SoC's Clock Domain. This makes the number of
>     power areas a compile-time constant, and allows to drop PD_ALWAYS_ON
>     and some checks.
>   - Split initialization in two phases,
>   - Document that ARM cores are controlled by PSCI on R-Car Gen3
>     (although the underlying CPG/APMU hardware is the same as on Gen2),
>   - Minor improvements (double evaluation, unused parameter, debug
>     message consolidation),
>
> v3:
>   - Drop check for CONFIG_PM_GENERIC_DOMAINS, which is now always
>     enabled on R-Car SoCs,
>   - Create PM Domains from hierarchy in C data instead of DT,
>   - Initialize SYSCIER early, as SYSC needs the interrupt sources to be
>     enabled to control power,
>   - Mask all SYSC interrupt sources for the CPU,
>   - Add support for an "always-on" domain,
>   - Use early_initcall() instead of core_initcall(),
>   - Do not power up CPU power areas during initialization, as this is
>     handled later (directly or indirectly) by the SMP code,
>
> v2:
>   - Add missing definitions for SYSC_PWR_CA15_CPU and SYSC_PWR_CA7_CPU,
>   - Add R-Car H3 (r8a7795) support,
>   - Drop tests for CONFIG_ARCH_SHMOBILE_LEGACY,
>   - Add missing break statements in rcar_sysc_pwr_on_off(),
>   - Add missing calls to of_node_put() in error paths,
>   - Fix build if CONFIG_PM=n,
>   - Update compatible values,
>   - Update copyright.
> ---
>  drivers/soc/renesas/rcar-sysc.c | 202 +++++++++++++++++++++++++++++++++++++++-
>  drivers/soc/renesas/rcar-sysc.h |  53 +++++++++++
>  2 files changed, 254 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/soc/renesas/rcar-sysc.h
>
> diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
> index 9ba5fd15c53bf9b9..95f2b59cbd76f777 100644
> --- a/drivers/soc/renesas/rcar-sysc.c
> +++ b/drivers/soc/renesas/rcar-sysc.c
> @@ -2,6 +2,7 @@
>   * R-Car SYSC Power management support
>   *
>   * Copyright (C) 2014  Magnus Damm
> + * Copyright (C) 2015-2016 Glider bvba
>   *
>   * This file is subject to the terms and conditions of the GNU General Public
>   * License.  See the file "COPYING" in the main directory of this archive
> @@ -11,10 +12,15 @@
>  #include <linux/delay.h>
>  #include <linux/err.h>
>  #include <linux/mm.h>
> +#include <linux/of_address.h>
> +#include <linux/pm_domain.h>
> +#include <linux/slab.h>
>  #include <linux/spinlock.h>
>  #include <linux/io.h>
>  #include <linux/soc/renesas/rcar-sysc.h>
>
> +#include "rcar-sysc.h"
> +
>  /* SYSC Common */
>  #define SYSCSR                 0x00    /* SYSC Status Register */
>  #define SYSCISR                        0x04    /* Interrupt Status Register */
> @@ -29,7 +35,8 @@
>  /*
>   * Power Control Register Offsets inside the register block for each domain
>   * Note: The "CR" registers for ARM cores exist on H1 only
> - *       Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *      Use WFI to power off, CPG/APMU to resume ARM cores on R-Car Gen2
> + *      Use PSCI on R-Car Gen3
>   */
>  #define PWRSR_OFFS             0x00    /* Power Status Register */
>  #define PWROFFCR_OFFS          0x04    /* Power Shutoff Control Register */
> @@ -48,6 +55,8 @@
>  #define SYSCISR_RETRIES                1000
>  #define SYSCISR_DELAY_US       1
>
> +#define RCAR_PD_ALWAYS_ON      32      /* Always-on power area */
> +
>  static void __iomem *rcar_sysc_base;
>  static DEFINE_SPINLOCK(rcar_sysc_lock); /* SMP CPUs + I/O devices */
>
> @@ -162,3 +171,194 @@ void __iomem *rcar_sysc_init(phys_addr_t base)
>
>         return rcar_sysc_base;
>  }
> +
> +struct rcar_sysc_pd {
> +       struct generic_pm_domain genpd;
> +       struct rcar_sysc_ch ch;
> +       unsigned int flags;
> +       char name[0];
> +};
> +
> +static inline struct rcar_sysc_pd *to_rcar_pd(struct generic_pm_domain *d)
> +{
> +       return container_of(d, struct rcar_sysc_pd, genpd);
> +}
> +
> +static int rcar_sysc_pd_power_off(struct generic_pm_domain *genpd)
> +{
> +       struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +       pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +       if (pd->flags & PD_NO_CR) {
> +               pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +               return -EBUSY;
> +       }
> +
> +       if (pd->flags & PD_BUSY) {
> +               pr_debug("%s: %s busy\n", __func__, genpd->name);
> +               return -EBUSY;
> +       }
> +
> +       return rcar_sysc_power_down(&pd->ch);
> +}
> +
> +static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
> +{
> +       struct rcar_sysc_pd *pd = to_rcar_pd(genpd);
> +
> +       pr_debug("%s: %s\n", __func__, genpd->name);
> +
> +       if (pd->flags & PD_NO_CR) {
> +               pr_debug("%s: Cannot control %s\n", __func__, genpd->name);
> +               return 0;
> +       }
> +
> +       return rcar_sysc_power_up(&pd->ch);
> +}
> +
> +static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
> +{
> +       struct generic_pm_domain *genpd = &pd->genpd;
> +       const char *name = pd->genpd.name;
> +       struct dev_power_governor *gov = &simple_qos_governor;
> +
> +       if (pd->flags & PD_CPU) {
> +               /*
> +                * This domain contains a CPU core and therefore it should
> +                * only be turned off if the CPU is not in use.
> +                */
> +               pr_debug("PM domain %s contains %s\n", name, "CPU");
> +               pd->flags |= PD_BUSY;
> +               gov = &pm_domain_always_on_gov;
> +       } else if (pd->flags & PD_SCU) {
> +               /*
> +                * This domain contains an SCU and cache-controller, and
> +                * therefore it should only be turned off if the CPU cores are
> +                * not in use.
> +                */
> +               pr_debug("PM domain %s contains %s\n", name, "SCU");
> +               pd->flags |= PD_BUSY;
> +               gov = &pm_domain_always_on_gov;
> +       } else if (pd->flags & PD_NO_CR) {
> +               /*
> +                * This domain cannot be turned off.
> +                */
> +               pd->flags |= PD_BUSY;
> +               gov = &pm_domain_always_on_gov;
> +       }
> +
> +       genpd->power_off = rcar_sysc_pd_power_off;
> +       genpd->power_on = rcar_sysc_pd_power_on;
> +
> +       if (pd->flags & (PD_CPU | PD_NO_CR)) {
> +               /* Skip CPUs (handled by SMP code) and areas without control */
> +               pr_debug("%s: Not touching %s\n", __func__, genpd->name);
> +               goto finalize;
> +       }
> +
> +       if (!rcar_sysc_power_is_off(&pd->ch)) {
> +               pr_debug("%s: %s is already powered\n", __func__, genpd->name);
> +               goto finalize;
> +       }
> +
> +       rcar_sysc_power_up(&pd->ch);
> +
> +finalize:
> +       pm_genpd_init(genpd, gov, false);
> +}
> +
> +static const struct of_device_id rcar_sysc_matches[] = {
> +       { /* sentinel */ }
> +};
> +
> +struct rcar_pm_domains {
> +       struct genpd_onecell_data onecell_data;
> +       struct generic_pm_domain *domains[RCAR_PD_ALWAYS_ON + 1];
> +};
> +
> +static int __init rcar_sysc_pd_init(void)
> +{
> +       const struct rcar_sysc_info *info;
> +       const struct of_device_id *match;
> +       struct rcar_pm_domains *domains;
> +       struct device_node *np;
> +       u32 syscier, syscimr;
> +       void __iomem *base;
> +       unsigned int i;
> +       int error;
> +
> +       np = of_find_matching_node_and_match(NULL, rcar_sysc_matches, &match);
> +       if (!np)
> +               return -ENODEV;
> +
> +       info = match->data;
> +
> +       base = of_iomap(np, 0);
> +       if (!base) {
> +               pr_warn("%s: Cannot map regs\n", np->full_name);
> +               error = -ENOMEM;
> +               goto out_put;
> +       }
> +
> +       rcar_sysc_base = base;
> +
> +       domains = kzalloc(sizeof(*domains), GFP_KERNEL);
> +       if (!domains) {
> +               error = -ENOMEM;
> +               goto out_put;
> +       }
> +
> +       domains->onecell_data.domains = domains->domains;
> +       domains->onecell_data.num_domains = ARRAY_SIZE(domains->domains);
> +
> +       for (i = 0, syscier = 0; i < info->num_areas; i++)
> +               syscier |= BIT(info->areas[i].isr_bit);
> +
> +       /*
> +        * Mask all interrupt sources to prevent the CPU from receiving them.
> +        * Make sure not to clear reserved bits that were set before.
> +        */
> +       syscimr = ioread32(base + SYSCIMR);
> +       syscimr |= syscier;
> +       pr_debug("%s: syscimr = 0x%08x\n", np->full_name, syscimr);
> +       iowrite32(syscimr, base + SYSCIMR);
> +
> +       /*
> +        * SYSC needs all interrupt sources enabled to control power.
> +        */
> +       pr_debug("%s: syscier = 0x%08x\n", np->full_name, syscier);
> +       iowrite32(syscier, base + SYSCIER);
> +
> +       for (i = 0; i < info->num_areas; i++) {
> +               const struct rcar_sysc_area *area = &info->areas[i];
> +               struct rcar_sysc_pd *pd;
> +
> +               pd = kzalloc(sizeof(*pd) + strlen(area->name) + 1, GFP_KERNEL);
> +               if (!pd) {
> +                       error = -ENOMEM;
> +                       goto out_put;
> +               }
> +
> +               strcpy(pd->name, area->name);
> +               pd->genpd.name = pd->name;
> +               pd->ch.chan_offs = area->chan_offs;
> +               pd->ch.chan_bit = area->chan_bit;
> +               pd->ch.isr_bit = area->isr_bit;
> +               pd->flags = area->flags;
> +
> +               rcar_sysc_pd_setup(pd);
> +               if (area->parent >= 0)
> +                       pm_genpd_add_subdomain(domains->domains[area->parent],
> +                                              &pd->genpd);
> +
> +               domains->domains[area->isr_bit] = &pd->genpd;
> +       }
> +
> +       of_genpd_add_provider_onecell(np, &domains->onecell_data);
> +
> +out_put:
> +       of_node_put(np);
> +       return error;
> +}
> +early_initcall(rcar_sysc_pd_init);
> diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
> new file mode 100644
> index 0000000000000000..7bb48b4f7334f960
> --- /dev/null
> +++ b/drivers/soc/renesas/rcar-sysc.h
> @@ -0,0 +1,53 @@
> +/*
> + * Renesas R-Car System Controller
> + *
> + * Copyright (C) 2016 Glider bvba
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 2 of the License.
> + */
> +#ifndef __SOC_RENESAS_RCAR_SYSC_H__
> +#define __SOC_RENESAS_RCAR_SYSC_H__
> +
> +#include <linux/types.h>
> +
> +
> +/*
> + * Power Domain flags
> + */
> +#define PD_CPU         BIT(0)  /* Area contains main CPU core */
> +#define PD_SCU         BIT(1)  /* Area contains SCU and L2 cache */
> +#define PD_NO_CR       BIT(2)  /* Area lacks PWR{ON,OFF}CR registers */
> +
> +#define PD_BUSY                BIT(3)  /* Busy, for internal use only */
> +
> +#define PD_CPU_CR      PD_CPU            /* CPU area has CR (R-Car H1) */
> +#define PD_CPU_NOCR    PD_CPU | PD_NO_CR /* CPU area lacks CR (R-Car Gen2/3) */
> +#define PD_ALWAYS_ON   PD_NO_CR          /* Always-on area */
> +
> +
> +/*
> + * Description of a Power Area
> + */
> +
> +struct rcar_sysc_area {
> +       const char *name;
> +       u16 chan_offs;          /* Offset of PWRSR register for this area */
> +       u8 chan_bit;            /* Bit in PWR* (except for PWRUP in PWRSR) */
> +       u8 isr_bit;             /* Bit in SYSCI*R */
> +       int parent;             /* -1 if none */
> +       unsigned int flags;     /* See PD_* */
> +};
> +
> +
> +/*
> + * SoC-specific Power Area Description
> + */
> +
> +struct rcar_sysc_info {
> +       const struct rcar_sysc_area *areas;
> +       unsigned int num_areas;
> +};
> +
> +#endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
> --
> 1.9.1
>

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
  2016-04-20 12:02   ` Geert Uytterhoeven
@ 2016-04-22  7:28     ` Ulf Hansson
  -1 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2016-04-22  7:28 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Simon Horman, Magnus Damm, Rafael J. Wysocki, Kevin Hilman,
	Laurent Pinchart, linux-renesas-soc, linux-arm-kernel, linux-pm

On 20 April 2016 at 14:02, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> On R-Car H3, some power areas (e.g. A3VP) contain I/O devices, which are
> also part of the CPG/MSSR Clock Domain.
> On all R-Car SoCs, devices in the "always-on" PM Domain are part of the
> Clock Domain served by the CPG/MSSR or CPG/MSTP driver.
>
> Hook up the CPG/MSTP or CPG/MSSR Clock Domain attach/detach callbacks to
> enable power management using module clocks. Which callback to hook up
> depends on the presence of device nodes compatible with
> "renesas,cpg-mstp-clocks". This clears the path for a future migration
> from the CPG/MSTP to the CPG/MSSR driver on R-Car H1 and
> Gen2.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> v6:
>   - Add Reviewed-by,
>   - Rebased,
>
> v5:
>   - Revert v4 changes,
>   - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks,
>   - Drop dependency on r8a7795, as this is used for the "always-on" PM
>     Domain on R-Car H1 and Gen2, too,
>
> v4:
>   - Remove the explicit dependency on the CPG/MSSR driver by forwarding
>     the attach/detach callbacks to the parent PM Domain.
>     If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
>     common genpd code later.
>
> v3:
>   - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
>     using our own copies,
>
> v2:
>   - New.
> ---
>  drivers/soc/renesas/rcar-sysc.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
> index 4e760d63f2abd93f..0d49a25de740fbf8 100644
> --- a/drivers/soc/renesas/rcar-sysc.c
> +++ b/drivers/soc/renesas/rcar-sysc.c
> @@ -9,6 +9,7 @@
>   * for more details.
>   */
>
> +#include <linux/clk/renesas.h>
>  #include <linux/delay.h>
>  #include <linux/err.h>
>  #include <linux/mm.h>
> @@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
>         return rcar_sysc_power_up(&pd->ch);
>  }
>
> +static bool has_cpg_mstp;
> +

That's seems lazy. :-)

Sure you can provide this as an input parameter to
rcar_sysc_pd_setup() instead, no?

>  static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
>  {
>         struct generic_pm_domain *genpd = &pd->genpd;
> @@ -248,6 +251,18 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
>                 gov = &pm_domain_always_on_gov;
>         }
>
> +       if (!(pd->flags & (PD_CPU | PD_SCU))) {
> +               /* Enable Clock Domain for I/O devices */
> +               genpd->flags = GENPD_FLAG_PM_CLK;
> +               if (has_cpg_mstp) {
> +                       genpd->attach_dev = cpg_mstp_attach_dev;
> +                       genpd->detach_dev = cpg_mstp_detach_dev;
> +               } else {
> +                       genpd->attach_dev = cpg_mssr_attach_dev;
> +                       genpd->detach_dev = cpg_mssr_detach_dev;
> +               }
> +       }
> +
>         genpd->power_off = rcar_sysc_pd_power_off;
>         genpd->power_on = rcar_sysc_pd_power_on;
>
> @@ -294,6 +309,9 @@ static int __init rcar_sysc_pd_init(void)
>
>         info = match->data;
>
> +       has_cpg_mstp = of_find_compatible_node(NULL, NULL,
> +                                              "renesas,cpg-mstp-clocks");
> +
>         base = of_iomap(np, 0);
>         if (!base) {
>                 pr_warn("%s: Cannot map regs\n", np->full_name);
> --
> 1.9.1
>

Kind regards
Uffe

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
@ 2016-04-22  7:28     ` Ulf Hansson
  0 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2016-04-22  7:28 UTC (permalink / raw)
  To: linux-arm-kernel

On 20 April 2016 at 14:02, Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> On R-Car H3, some power areas (e.g. A3VP) contain I/O devices, which are
> also part of the CPG/MSSR Clock Domain.
> On all R-Car SoCs, devices in the "always-on" PM Domain are part of the
> Clock Domain served by the CPG/MSSR or CPG/MSTP driver.
>
> Hook up the CPG/MSTP or CPG/MSSR Clock Domain attach/detach callbacks to
> enable power management using module clocks. Which callback to hook up
> depends on the presence of device nodes compatible with
> "renesas,cpg-mstp-clocks". This clears the path for a future migration
> from the CPG/MSTP to the CPG/MSSR driver on R-Car H1 and
> Gen2.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> v6:
>   - Add Reviewed-by,
>   - Rebased,
>
> v5:
>   - Revert v4 changes,
>   - Use either the cpg_mssr_*() or cpg_mstp_*() callbacks,
>   - Drop dependency on r8a7795, as this is used for the "always-on" PM
>     Domain on R-Car H1 and Gen2, too,
>
> v4:
>   - Remove the explicit dependency on the CPG/MSSR driver by forwarding
>     the attach/detach callbacks to the parent PM Domain.
>     If deemed reusable, rcar_sysc_{at,de}tach_dev() can be moved to
>     common genpd code later.
>
> v3:
>   - Hook up the CPG/MSSR Clock Domain attach/detach callbacks instead of
>     using our own copies,
>
> v2:
>   - New.
> ---
>  drivers/soc/renesas/rcar-sysc.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
> index 4e760d63f2abd93f..0d49a25de740fbf8 100644
> --- a/drivers/soc/renesas/rcar-sysc.c
> +++ b/drivers/soc/renesas/rcar-sysc.c
> @@ -9,6 +9,7 @@
>   * for more details.
>   */
>
> +#include <linux/clk/renesas.h>
>  #include <linux/delay.h>
>  #include <linux/err.h>
>  #include <linux/mm.h>
> @@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
>         return rcar_sysc_power_up(&pd->ch);
>  }
>
> +static bool has_cpg_mstp;
> +

That's seems lazy. :-)

Sure you can provide this as an input parameter to
rcar_sysc_pd_setup() instead, no?

>  static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
>  {
>         struct generic_pm_domain *genpd = &pd->genpd;
> @@ -248,6 +251,18 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)
>                 gov = &pm_domain_always_on_gov;
>         }
>
> +       if (!(pd->flags & (PD_CPU | PD_SCU))) {
> +               /* Enable Clock Domain for I/O devices */
> +               genpd->flags = GENPD_FLAG_PM_CLK;
> +               if (has_cpg_mstp) {
> +                       genpd->attach_dev = cpg_mstp_attach_dev;
> +                       genpd->detach_dev = cpg_mstp_detach_dev;
> +               } else {
> +                       genpd->attach_dev = cpg_mssr_attach_dev;
> +                       genpd->detach_dev = cpg_mssr_detach_dev;
> +               }
> +       }
> +
>         genpd->power_off = rcar_sysc_pd_power_off;
>         genpd->power_on = rcar_sysc_pd_power_on;
>
> @@ -294,6 +309,9 @@ static int __init rcar_sysc_pd_init(void)
>
>         info = match->data;
>
> +       has_cpg_mstp = of_find_compatible_node(NULL, NULL,
> +                                              "renesas,cpg-mstp-clocks");
> +
>         base = of_iomap(np, 0);
>         if (!base) {
>                 pr_warn("%s: Cannot map regs\n", np->full_name);
> --
> 1.9.1
>

Kind regards
Uffe

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
  2016-04-22  7:28     ` Ulf Hansson
@ 2016-04-22  7:59       ` Geert Uytterhoeven
  -1 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-22  7:59 UTC (permalink / raw)
  To: Ulf Hansson
  Cc: Geert Uytterhoeven, Simon Horman, Magnus Damm, Rafael J. Wysocki,
	Kevin Hilman, Laurent Pinchart, linux-renesas-soc,
	linux-arm-kernel, linux-pm

Hi Ulf,

On Fri, Apr 22, 2016 at 9:28 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> @@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
>>         return rcar_sysc_power_up(&pd->ch);
>>  }
>>
>> +static bool has_cpg_mstp;
>> +
>
> That's seems lazy. :-)
>
> Sure you can provide this as an input parameter to
> rcar_sysc_pd_setup() instead, no?

This variable is intended to go away, once all R-Car SoCs have been converted
to use the CPG/MSSR driver, and has_cpg_mstp will always be false.
Then we can just remove those lines, instead of reworking the parameter
passing.

(I have to admit I just didn't think about using a parameter, but the
 explanation above is still valid)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
@ 2016-04-22  7:59       ` Geert Uytterhoeven
  0 siblings, 0 replies; 48+ messages in thread
From: Geert Uytterhoeven @ 2016-04-22  7:59 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Ulf,

On Fri, Apr 22, 2016 at 9:28 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>> @@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
>>         return rcar_sysc_power_up(&pd->ch);
>>  }
>>
>> +static bool has_cpg_mstp;
>> +
>
> That's seems lazy. :-)
>
> Sure you can provide this as an input parameter to
> rcar_sysc_pd_setup() instead, no?

This variable is intended to go away, once all R-Car SoCs have been converted
to use the CPG/MSSR driver, and has_cpg_mstp will always be false.
Then we can just remove those lines, instead of reworking the parameter
passing.

(I have to admit I just didn't think about using a parameter, but the
 explanation above is still valid)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
  2016-04-22  4:12         ` Laurent Pinchart
@ 2016-04-22  8:15           ` Simon Horman
  -1 siblings, 0 replies; 48+ messages in thread
From: Simon Horman @ 2016-04-22  8:15 UTC (permalink / raw)
  To: Laurent Pinchart, Geert Uytterhoeven
  Cc: Geert Uytterhoeven, Magnus Damm, Rafael J. Wysocki, Kevin Hilman,
	Ulf Hansson, linux-renesas-soc, linux-arm-kernel, Linux PM list

Hi Laurent, Hi Geert,

On Fri, Apr 22, 2016 at 07:12:23AM +0300, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 22 Apr 2016 10:33:11 Simon Horman wrote:
> > On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> > > On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> > > > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> > > >> This patch series introduces 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.
> > > >> 
> > > >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> > > >> the VSPs are located in a PM Domain.

[...]

> > I do wonder, as we are almost at the closing point for queuing up changes
> > for v4.7 if, assuming the above patches are scheduled for inclusion in
> > v4.7-rc1, it might not be better for me to queue up this series for v4.8.
> 
> Then that would delay a bunch of multimedia patch by one more kernel cycle, 
> which I was hoping to avoid.

On Fri, Apr 22, 2016 at 09:02:01AM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Fri, Apr 22, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> >> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> >> > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >> >> This patch series introduces 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.
> >> >>
> >> >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> >> >> the VSPs are located in a PM Domain.

[...]

> > To my mind I need some kind of assurance from the clk maintainers that the
> > patches are stable there - in particular that the commit ids won't change.
> 
> As the clock maintainer pulled the same tag instead of applying emailed
> patches, the commit IDs won't change, even if he has to rework the clk-next
> branch and repull.
> 
> > And that both they and the ARM-SoC maintainers are happy with me pulling
> > it into my tree for this purpose.
> 
> I also mentioned that in the pull request. Pulling in a stable branch is
> standard procedure: the code fails to compile if you don't merge
> tags/clk-renesas-for-v4.7-tag2 first.
> 
> > I do wonder, as we are almost at the closing point for queuing up changes
> > for v4.7 if, assuming the above patches are scheduled for inclusion in
> > v4.7-rc1, it might not be better for me to queue up this series for v4.8.
> >
> > I could do that sooner rather than later in the devel branch of the renesas
> > tree if you like.
> 
> v4.7-rc1 is still more than one month in the future.
> 
> As Laurent said, that would delay multimedia work by one more kernel cycle,
> as R-Car SYSC PM Domains already missed v4.6.
> In addition, it would mean continued rebasing/updating of "[PATCH v5 00/12]
> ARM/arm64: dts: rcar: Add SYSC PM domains" in renesas-drivers, as it touches
> all R-Car DTSes all over the place.
> 
> Thanks for reconsidering!

Thanks for your feedback. I now have a better understanding of the
situation both in regards to the state of the branch and the dependencies
on it.

I have reconsidered and queued up this series for v4.7.
It is now present in the next branch of the renesas tree.

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-22  8:15           ` Simon Horman
  0 siblings, 0 replies; 48+ messages in thread
From: Simon Horman @ 2016-04-22  8:15 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Laurent, Hi Geert,

On Fri, Apr 22, 2016 at 07:12:23AM +0300, Laurent Pinchart wrote:
> Hi Simon,
> 
> On Friday 22 Apr 2016 10:33:11 Simon Horman wrote:
> > On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> > > On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> > > > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> > > >> This patch series introduces 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.
> > > >> 
> > > >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> > > >> the VSPs are located in a PM Domain.

[...]

> > I do wonder, as we are almost at the closing point for queuing up changes
> > for v4.7 if, assuming the above patches are scheduled for inclusion in
> > v4.7-rc1, it might not be better for me to queue up this series for v4.8.
> 
> Then that would delay a bunch of multimedia patch by one more kernel cycle, 
> which I was hoping to avoid.

On Fri, Apr 22, 2016 at 09:02:01AM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Fri, Apr 22, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> >> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman <horms@verge.net.au> wrote:
> >> > On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >> >> This patch series introduces 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.
> >> >>
> >> >> This is a dependency for the enablement of DU and VSP on R-Car H3, as
> >> >> the VSPs are located in a PM Domain.

[...]

> > To my mind I need some kind of assurance from the clk maintainers that the
> > patches are stable there - in particular that the commit ids won't change.
> 
> As the clock maintainer pulled the same tag instead of applying emailed
> patches, the commit IDs won't change, even if he has to rework the clk-next
> branch and repull.
> 
> > And that both they and the ARM-SoC maintainers are happy with me pulling
> > it into my tree for this purpose.
> 
> I also mentioned that in the pull request. Pulling in a stable branch is
> standard procedure: the code fails to compile if you don't merge
> tags/clk-renesas-for-v4.7-tag2 first.
> 
> > I do wonder, as we are almost at the closing point for queuing up changes
> > for v4.7 if, assuming the above patches are scheduled for inclusion in
> > v4.7-rc1, it might not be better for me to queue up this series for v4.8.
> >
> > I could do that sooner rather than later in the devel branch of the renesas
> > tree if you like.
> 
> v4.7-rc1 is still more than one month in the future.
> 
> As Laurent said, that would delay multimedia work by one more kernel cycle,
> as R-Car SYSC PM Domains already missed v4.6.
> In addition, it would mean continued rebasing/updating of "[PATCH v5 00/12]
> ARM/arm64: dts: rcar: Add SYSC PM domains" in renesas-drivers, as it touches
> all R-Car DTSes all over the place.
> 
> Thanks for reconsidering!

Thanks for your feedback. I now have a better understanding of the
situation both in regards to the state of the branch and the dependencies
on it.

I have reconsidered and queued up this series for v4.7.
It is now present in the next branch of the renesas tree.

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
  2016-04-22  8:15           ` Simon Horman
@ 2016-04-23  0:30             ` Laurent Pinchart
  -1 siblings, 0 replies; 48+ messages in thread
From: Laurent Pinchart @ 2016-04-23  0:30 UTC (permalink / raw)
  To: Simon Horman
  Cc: Geert Uytterhoeven, Geert Uytterhoeven, Magnus Damm,
	Rafael J. Wysocki, Kevin Hilman, Ulf Hansson, linux-renesas-soc,
	linux-arm-kernel, Linux PM list

Hi Simon,

On Friday 22 Apr 2016 18:15:35 Simon Horman wrote:
> On Fri, Apr 22, 2016 at 07:12:23AM +0300, Laurent Pinchart wrote:
> > On Friday 22 Apr 2016 10:33:11 Simon Horman wrote:
> >> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> >>> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman wrote:
> >>>> On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >>>>> This patch series introduces 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.
> >>>>> 
> >>>>> This is a dependency for the enablement of DU and VSP on R-Car H3,
> >>>>> as the VSPs are located in a PM Domain.
> 
> [...]
> 
> >> I do wonder, as we are almost at the closing point for queuing up
> >> changes for v4.7 if, assuming the above patches are scheduled for
> >> inclusion in v4.7-rc1, it might not be better for me to queue up this
> >> series for v4.8.
> > 
> > Then that would delay a bunch of multimedia patch by one more kernel
> > cycle, which I was hoping to avoid.
> 
> On Fri, Apr 22, 2016 at 09:02:01AM +0200, Geert Uytterhoeven wrote:
> > On Fri, Apr 22, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote:
> >> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> >>> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman wrote:
> >>>> On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >>>>> This patch series introduces 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.
> >>>>> 
> >>>>> This is a dependency for the enablement of DU and VSP on R-Car H3,
> >>>>> as the VSPs are located in a PM Domain.
> 
> [...]
> 
> >> To my mind I need some kind of assurance from the clk maintainers that
> >> the patches are stable there - in particular that the commit ids won't
> >> change.
> > 
> > As the clock maintainer pulled the same tag instead of applying emailed
> > patches, the commit IDs won't change, even if he has to rework the
> > clk-next branch and repull.
> > 
> >> And that both they and the ARM-SoC maintainers are happy with me pulling
> >> it into my tree for this purpose.
> > 
> > I also mentioned that in the pull request. Pulling in a stable branch is
> > standard procedure: the code fails to compile if you don't merge
> > tags/clk-renesas-for-v4.7-tag2 first.
> >
> >> I do wonder, as we are almost at the closing point for queuing up
> >> changes for v4.7 if, assuming the above patches are scheduled for
> >> inclusion in v4.7-rc1, it might not be better for me to queue up this
> >> series for v4.8.
> >> 
> >> I could do that sooner rather than later in the devel branch of the
> >> renesas tree if you like.
> > 
> > v4.7-rc1 is still more than one month in the future.
> > 
> > As Laurent said, that would delay multimedia work by one more kernel
> > cycle, as R-Car SYSC PM Domains already missed v4.6.
> > In addition, it would mean continued rebasing/updating of "[PATCH v5
> > 00/12] ARM/arm64: dts: rcar: Add SYSC PM domains" in renesas-drivers, as
> > it touches all R-Car DTSes all over the place.
> > 
> > Thanks for reconsidering!
> 
> Thanks for your feedback. I now have a better understanding of the
> situation both in regards to the state of the branch and the dependencies
> on it.
> 
> I have reconsidered and queued up this series for v4.7.
> It is now present in the next branch of the renesas tree.

Thanks a lot.

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support
@ 2016-04-23  0:30             ` Laurent Pinchart
  0 siblings, 0 replies; 48+ messages in thread
From: Laurent Pinchart @ 2016-04-23  0:30 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Simon,

On Friday 22 Apr 2016 18:15:35 Simon Horman wrote:
> On Fri, Apr 22, 2016 at 07:12:23AM +0300, Laurent Pinchart wrote:
> > On Friday 22 Apr 2016 10:33:11 Simon Horman wrote:
> >> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> >>> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman wrote:
> >>>> On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >>>>> This patch series introduces 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.
> >>>>> 
> >>>>> This is a dependency for the enablement of DU and VSP on R-Car H3,
> >>>>> as the VSPs are located in a PM Domain.
> 
> [...]
> 
> >> I do wonder, as we are almost at the closing point for queuing up
> >> changes for v4.7 if, assuming the above patches are scheduled for
> >> inclusion in v4.7-rc1, it might not be better for me to queue up this
> >> series for v4.8.
> > 
> > Then that would delay a bunch of multimedia patch by one more kernel
> > cycle, which I was hoping to avoid.
> 
> On Fri, Apr 22, 2016 at 09:02:01AM +0200, Geert Uytterhoeven wrote:
> > On Fri, Apr 22, 2016 at 2:33 AM, Simon Horman <horms@verge.net.au> wrote:
> >> On Thu, Apr 21, 2016 at 05:14:40PM +0200, Geert Uytterhoeven wrote:
> >>> On Thu, Apr 21, 2016 at 5:28 AM, Simon Horman wrote:
> >>>> On Wed, Apr 20, 2016 at 02:02:35PM +0200, Geert Uytterhoeven wrote:
> >>>>> This patch series introduces 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.
> >>>>> 
> >>>>> This is a dependency for the enablement of DU and VSP on R-Car H3,
> >>>>> as the VSPs are located in a PM Domain.
> 
> [...]
> 
> >> To my mind I need some kind of assurance from the clk maintainers that
> >> the patches are stable there - in particular that the commit ids won't
> >> change.
> > 
> > As the clock maintainer pulled the same tag instead of applying emailed
> > patches, the commit IDs won't change, even if he has to rework the
> > clk-next branch and repull.
> > 
> >> And that both they and the ARM-SoC maintainers are happy with me pulling
> >> it into my tree for this purpose.
> > 
> > I also mentioned that in the pull request. Pulling in a stable branch is
> > standard procedure: the code fails to compile if you don't merge
> > tags/clk-renesas-for-v4.7-tag2 first.
> >
> >> I do wonder, as we are almost at the closing point for queuing up
> >> changes for v4.7 if, assuming the above patches are scheduled for
> >> inclusion in v4.7-rc1, it might not be better for me to queue up this
> >> series for v4.8.
> >> 
> >> I could do that sooner rather than later in the devel branch of the
> >> renesas tree if you like.
> > 
> > v4.7-rc1 is still more than one month in the future.
> > 
> > As Laurent said, that would delay multimedia work by one more kernel
> > cycle, as R-Car SYSC PM Domains already missed v4.6.
> > In addition, it would mean continued rebasing/updating of "[PATCH v5
> > 00/12] ARM/arm64: dts: rcar: Add SYSC PM domains" in renesas-drivers, as
> > it touches all R-Car DTSes all over the place.
> > 
> > Thanks for reconsidering!
> 
> Thanks for your feedback. I now have a better understanding of the
> situation both in regards to the state of the branch and the dependencies
> on it.
> 
> I have reconsidered and queued up this series for v4.7.
> It is now present in the next branch of the renesas tree.

Thanks a lot.

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 48+ messages in thread
* Re: [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
  2016-04-22  7:59       ` Geert Uytterhoeven
@ 2016-04-25  8:30         ` Ulf Hansson
  -1 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2016-04-25  8:30 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Geert Uytterhoeven, Simon Horman, Magnus Damm, Rafael J. Wysocki,
	Kevin Hilman, Laurent Pinchart, linux-renesas-soc,
	linux-arm-kernel, linux-pm

On 22 April 2016 at 09:59, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> Hi Ulf,
>
> On Fri, Apr 22, 2016 at 9:28 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>>> @@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
>>>         return rcar_sysc_power_up(&pd->ch);
>>>  }
>>>
>>> +static bool has_cpg_mstp;
>>> +
>>
>> That's seems lazy. :-)
>>
>> Sure you can provide this as an input parameter to
>> rcar_sysc_pd_setup() instead, no?
>
> This variable is intended to go away, once all R-Car SoCs have been converted
> to use the CPG/MSSR driver, and has_cpg_mstp will always be false.
> Then we can just remove those lines, instead of reworking the parameter
> passing.

Okay, that seems like a reasonable way forward.

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

^ permalink raw reply	[flat|nested] 48+ messages in thread
* [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
@ 2016-04-25  8:30         ` Ulf Hansson
  0 siblings, 0 replies; 48+ messages in thread
From: Ulf Hansson @ 2016-04-25  8:30 UTC (permalink / raw)
  To: linux-arm-kernel

On 22 April 2016 at 09:59, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> Hi Ulf,
>
> On Fri, Apr 22, 2016 at 9:28 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
>>> @@ -217,6 +218,8 @@ static int rcar_sysc_pd_power_on(struct generic_pm_domain *genpd)
>>>         return rcar_sysc_power_up(&pd->ch);
>>>  }
>>>
>>> +static bool has_cpg_mstp;
>>> +
>>
>> That's seems lazy. :-)
>>
>> Sure you can provide this as an input parameter to
>> rcar_sysc_pd_setup() instead, no?
>
> This variable is intended to go away, once all R-Car SoCs have been converted
> to use the CPG/MSSR driver, and has_cpg_mstp will always be false.
> Then we can just remove those lines, instead of reworking the parameter
> passing.

Okay, that seems like a reasonable way forward.

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>

Kind regards
Uffe

^ permalink raw reply	[flat|nested] 48+ messages in thread
end of thread, other threads:[~2016-04-25  8:30 UTC | newest]

Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-20 12:02 [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support Geert Uytterhoeven
2016-04-20 12:02 ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 01/11] soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 02/11] soc: renesas: rcar-sysc: Improve rcar_sysc_power() debug info Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 13:59   ` Laurent Pinchart
2016-04-20 13:59     ` Laurent Pinchart
2016-04-22  7:21   ` Ulf Hansson
2016-04-22  7:21     ` Ulf Hansson
2016-04-20 12:02 ` [PATCH v6 04/11] soc: renesas: rcar-sysc: Make rcar_sysc_power_is_off() static Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-22  7:28   ` Ulf Hansson
2016-04-22  7:28     ` Ulf Hansson
2016-04-22  7:59     ` Geert Uytterhoeven
2016-04-22  7:59       ` Geert Uytterhoeven
2016-04-25  8:30       ` Ulf Hansson
2016-04-25  8:30         ` Ulf Hansson
2016-04-20 12:02 ` [PATCH v6 06/11] soc: renesas: rcar-sysc: Add support for R-Car H1 power areas Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 07/11] soc: renesas: rcar-sysc: Add support for R-Car H2 " Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 08/11] soc: renesas: rcar-sysc: Add support for R-Car M2-W " Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 09/11] soc: renesas: rcar-sysc: Add support for R-Car M2-N " Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 10/11] soc: renesas: rcar-sysc: Add support for R-Car E2 " Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-20 12:02 ` [PATCH v6 11/11] soc: renesas: rcar-sysc: Add support for R-Car H3 " Geert Uytterhoeven
2016-04-20 12:02   ` Geert Uytterhoeven
2016-04-21  3:28 ` [PATCH v6 00/11] soc: renesas: Add R-Car SYSC PM Domain Support Simon Horman
2016-04-21  3:28   ` Simon Horman
2016-04-21 15:14   ` Geert Uytterhoeven
2016-04-21 15:14     ` Geert Uytterhoeven
2016-04-22  0:33     ` Simon Horman
2016-04-22  0:33       ` Simon Horman
2016-04-22  4:12       ` Laurent Pinchart
2016-04-22  4:12         ` Laurent Pinchart
2016-04-22  8:15         ` Simon Horman
2016-04-22  8:15           ` Simon Horman
2016-04-23  0:30           ` Laurent Pinchart
2016-04-23  0:30             ` Laurent Pinchart
2016-04-22  7:02       ` Geert Uytterhoeven
2016-04-22  7:02         ` Geert Uytterhoeven

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.