From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Simon Horman <horms@verge.net.au>, Magnus Damm <magnus.damm@gmail.com>
Cc: devicetree@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
linux-sh@vger.kernel.org, linux-pm@vger.kernel.org,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Tomasz Figa <tomasz.figa@gmail.com>,
linux-kernel@vger.kernel.org, Kevin Hilman <khilman@linaro.org>,
Philipp Zabel <philipp.zabel@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 3/7] ARM: shmobile: R-Mobile: Enable module clocks if !CONFIG_PM_RUNTIME
Date: Wed, 3 Dec 2014 14:41:43 +0100 [thread overview]
Message-ID: <1417614107-5985-4-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1417614107-5985-1-git-send-email-geert+renesas@glider.be>
If CONFIG_PM_RUNTIME is not set, the clocks must be enabled before the
devices can be used.
Currently these clocks are enabled by the !CONFIG_PM_RUNTIME version of
pm_clk_notify, activated by the hack in drivers/sh/pm_runtime.c, but
this will go away soon (at least for DT).
On detach, disabling the clocks is already handled by pm_clk_destroy().
On system suspend/resume, disabling/enabling clocks is already handled
from the genpd->dev_ops.{start,stop}() callbacks.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v6:
- No changes,
v5:
- No changes,
v4:
- New.
---
arch/arm/mach-shmobile/pm-rmobile.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index 168046c355fc8368..6d912ce801aa88bd 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -118,6 +118,14 @@ static int rmobile_pd_attach_dev(struct generic_pm_domain *domain,
goto fail;
}
+ if (!IS_ENABLED(CONFIG_PM_RUNTIME)) {
+ error = pm_clk_resume(dev);
+ if (error) {
+ dev_err(dev, "pm_clk_resume failed %d\n", error);
+ goto fail;
+ }
+ }
+
return 0;
fail:
--
1.9.1
next prev parent reply other threads:[~2014-12-03 13:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 13:41 [PATCH v6 0/7] ARM: shmobile: R-Mobile: DT PM domain support Geert Uytterhoeven
2014-12-03 13:41 ` [PATCH v6 1/7] PM / Domains: Add DT bindings for the R-Mobile System Controller Geert Uytterhoeven
2014-12-03 13:41 ` [PATCH v6 2/7] ARM: shmobile: R-Mobile: Use generic_pm_domain.attach_dev() for pm_clk setup Geert Uytterhoeven
2014-12-03 13:41 ` Geert Uytterhoeven [this message]
[not found] ` <1417614107-5985-4-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-12-04 13:41 ` [PATCH v6 3/7] ARM: shmobile: R-Mobile: Enable module clocks if !CONFIG_PM_RUNTIME Ulf Hansson
[not found] ` <CAPDyKFogROGA+MtQcGNfa052wPKxcs9cpT43NcpcyeGVFCwPoQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-12-04 13:51 ` Geert Uytterhoeven
2014-12-03 13:41 ` [PATCH v6 4/7] ARM: shmobile: R-Mobile: Store SYSC base address in rmobile_pm_domain Geert Uytterhoeven
2014-12-03 13:41 ` [PATCH v6 5/7] ARM: shmobile: R-Mobile: Add DT support for PM domains Geert Uytterhoeven
2014-12-03 13:41 ` [PATCH v6 6/7] ARM: shmobile: r8a7740 dtsi: Add PM domain support Geert Uytterhoeven
[not found] ` <1417614107-5985-1-git-send-email-geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
2014-12-03 13:41 ` [PATCH v6 7/7] drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd Geert Uytterhoeven
2014-12-04 7:30 ` [PATCH v6 0/7] ARM: shmobile: R-Mobile: DT PM domain support Simon Horman
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=1417614107-5985-4-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=devicetree@vger.kernel.org \
--cc=grygorii.strashko@ti.com \
--cc=horms@verge.net.au \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=philipp.zabel@gmail.com \
--cc=rjw@rjwysocki.net \
--cc=tomasz.figa@gmail.com \
--cc=ulf.hansson@linaro.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).