Commit 3864a53e authored Jan 04, 2018 by Olof Johansson

Merge tag 'renesas-soc2-for-v4.16' of...

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

Second Round of Renesas ARM Based SoC Updates for v4.16

* rcar-sysc: Keep wakeup sources active during system suspend

  Geert Uytterhoeven says "If an R-Car SYSC slave device is part of the
  CPG/MSTP or CPG/MSSR Clock Domain and to be used as a wakeup source, it
  must be kept active during system suspend.

  Currently this is handled in device-specific drivers by explicitly
  increasing the use count of the module clock when the device is
  configured as a wakeup source.  However, the proper way to prevent the
  device from being stopped is to inform this requirement to the genpd
  core, by setting the GENPD_FLAG_ACTIVE_WAKEUP flag.

  Note that this will only affect devices configured as wakeup sources."

* tag 'renesas-soc2-for-v4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  soc: renesas: rcar-sysc: Keep wakeup sources active during system suspend

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 33f0624c 91c719f5

drivers/soc/renesas/rcar-sysc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ static void __init rcar_sysc_pd_setup(struct rcar_sysc_pd *pd)

		if (!(pd->flags & (PD_CPU \| PD_SCU))) {
		/* Enable Clock Domain for I/O devices */
		genpd->flags \|= GENPD_FLAG_PM_CLK;
		genpd->flags \|= GENPD_FLAG_PM_CLK \| GENPD_FLAG_ACTIVE_WAKEUP;
		if (has_cpg_mstp) {
		genpd->attach_dev = cpg_mstp_attach_dev;
		genpd->detach_dev = cpg_mstp_detach_dev;

Admin message