* [GIT PULL] SH Drivers Updates for v4.0
@ 2015-02-27 1:25 Simon Horman
2015-02-27 1:25 ` [PATCH] drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Simon Horman @ 2015-02-27 1:25 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-sh, linux-kernel, Magnus Damm, Simon Horman
Hi Linus,
Please consider these SH drivers updates for v4.0.
I am sending this change after v4.0-rc1 has been released
as it depends on r8a7740 SoC changes which are present in that rc release.
I expect some more minor updates to the same file during the v4.1 release cycle
to reflect changes to other SoCs.
The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539:
Linux 4.0-rc1 (2015-02-22 18:21:14 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-drivers-for-v4.0
for you to fetch changes up to a5cb514f1f689a48595370a368b568e2f551ddfd:
drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd (2015-02-24 07:26:12 +0900)
----------------------------------------------------------------
SH Drivers Updates for v4.0
* Disable PM runtime for multi-platform r8a7740 with genpd
----------------------------------------------------------------
Geert Uytterhoeven (1):
drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd
drivers/sh/pm_runtime.c | 2 ++
1 file changed, 2 insertions(+)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd
2015-02-27 1:25 [GIT PULL] SH Drivers Updates for v4.0 Simon Horman
@ 2015-02-27 1:25 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2015-02-27 1:25 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-sh, linux-kernel, Magnus Damm, Geert Uytterhoeven, Simon Horman
From: Geert Uytterhoeven <geert+renesas@glider.be>
If the default PM domain using PM_CLK is used for PM runtime, the real PM
domain(s) cannot be registered from DT later.
Hence do not enable it when running a multi-platform kernel with genpd
support on an r8a7740. The R-Mobile PM domain driver will take care of
PM runtime management of the module clocks.
The default PM domain is still needed for:
- platforms without genpd support,
- the legacy (non-DT) case, where genpd may take over later, except
for the C5 "always on" PM domain.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
drivers/sh/pm_runtime.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index f3ee439d..cd4c293 100644
--- a/drivers/sh/pm_runtime.c
+++ b/drivers/sh/pm_runtime.c
@@ -81,7 +81,9 @@ static int __init sh_pm_runtime_init(void)
if (!of_machine_is_compatible("renesas,emev2") &&
!of_machine_is_compatible("renesas,r7s72100") &&
!of_machine_is_compatible("renesas,r8a73a4") &&
+#ifndef CONFIG_PM_GENERIC_DOMAINS_OF
!of_machine_is_compatible("renesas,r8a7740") &&
+#endif
!of_machine_is_compatible("renesas,r8a7778") &&
!of_machine_is_compatible("renesas,r8a7779") &&
!of_machine_is_compatible("renesas,r8a7790") &&
--
2.1.4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-27 1:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-27 1:25 [GIT PULL] SH Drivers Updates for v4.0 Simon Horman
2015-02-27 1:25 ` [PATCH] drivers: sh: Disable PM runtime for multi-platform r8a7740 with genpd Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®