From: geert+renesas@glider.be (Geert Uytterhoeven)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices
Date: Wed, 20 Apr 2016 14:02:40 +0200 [thread overview]
Message-ID: <1461153766-750-6-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1461153766-750-1-git-send-email-geert+renesas@glider.be>
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
next prev parent reply other threads:[~2016-04-20 12:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` [PATCH v6 01/11] soc: renesas: Move pm-rcar to drivers/soc/renesas/rcar-sysc 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 ` [PATCH v6 03/11] soc: renesas: rcar-sysc: Add DT support for SYSC PM domains Geert Uytterhoeven
2016-04-20 13:59 ` Laurent Pinchart
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 [this message]
2016-04-22 7:28 ` [PATCH v6 05/11] soc: renesas: rcar-sysc: Enable Clock Domain for I/O devices Ulf Hansson
2016-04-22 7:59 ` Geert Uytterhoeven
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 ` [PATCH v6 07/11] soc: renesas: rcar-sysc: Add support for R-Car H2 " 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 ` [PATCH v6 09/11] soc: renesas: rcar-sysc: Add support for R-Car M2-N " 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 ` [PATCH v6 11/11] soc: renesas: rcar-sysc: Add support for R-Car H3 " 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 15:14 ` Geert Uytterhoeven
2016-04-22 0:33 ` Simon Horman
2016-04-22 4:12 ` Laurent Pinchart
2016-04-22 8:15 ` Simon Horman
2016-04-23 0:30 ` Laurent Pinchart
2016-04-22 7:02 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461153766-750-6-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).