From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Simon Horman <horms@verge.net.au>, Magnus Damm <magnus.damm@gmail.com>
Cc: linux-sh@vger.kernel.org, linux-pm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH v2 6/6] drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd
Date: Wed, 14 Jan 2015 13:11:24 +0100 [thread overview]
Message-ID: <1421237484-16847-7-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1421237484-16847-1-git-send-email-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 sh73a0. 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>
---
v2:
- No changes
---
drivers/sh/pm_runtime.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c
index cd4c293f0dd0d375..6b16a67ba618b793 100644
--- a/drivers/sh/pm_runtime.c
+++ b/drivers/sh/pm_runtime.c
@@ -83,6 +83,7 @@ static int __init sh_pm_runtime_init(void)
!of_machine_is_compatible("renesas,r8a73a4") &&
#ifndef CONFIG_PM_GENERIC_DOMAINS_OF
!of_machine_is_compatible("renesas,r8a7740") &&
+ !of_machine_is_compatible("renesas,sh73a0") &&
#endif
!of_machine_is_compatible("renesas,r8a7778") &&
!of_machine_is_compatible("renesas,r8a7779") &&
@@ -91,8 +92,7 @@ static int __init sh_pm_runtime_init(void)
!of_machine_is_compatible("renesas,r8a7792") &&
!of_machine_is_compatible("renesas,r8a7793") &&
!of_machine_is_compatible("renesas,r8a7794") &&
- !of_machine_is_compatible("renesas,sh7372") &&
- !of_machine_is_compatible("renesas,sh73a0"))
+ !of_machine_is_compatible("renesas,sh7372"))
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2015-01-14 12:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 12:11 [PATCH v2 0/6] ARM: shmobile: sh73a0: DT PM domain support Geert Uytterhoeven
2015-01-14 12:11 ` [PATCH v2 1/6] PM / Domains: R-Mobile SYSC: Document SH-Mobile AG5 (sh73a0) binding Geert Uytterhoeven
2015-01-14 12:11 ` [PATCH v2 2/6] ARM: shmobile: R-Mobile: Consolidate rmobile_pd_suspend_*() Geert Uytterhoeven
2015-01-14 12:11 ` [PATCH v2 3/6] ARM: shmobile: R-Mobile: Generalize adding/looking up special PM domains Geert Uytterhoeven
2015-01-14 12:11 ` [PATCH v2 4/6] ARM: shmobile: R-Mobile: Special-case PM domains with memory-controllers Geert Uytterhoeven
2015-01-14 12:11 ` [PATCH v2 5/6] ARM: shmobile: sh73a0 dtsi: Add PM domain support Geert Uytterhoeven
2015-01-14 12:11 ` Geert Uytterhoeven [this message]
2015-01-14 23:53 ` [PATCH v2 0/6] ARM: shmobile: sh73a0: DT " Simon Horman
2015-01-15 9:32 ` Geert Uytterhoeven
2015-01-16 1:13 ` Simon Horman
2015-01-16 2:47 ` Simon Horman
2015-01-16 9:51 ` Geert Uytterhoeven
2015-01-16 12:45 ` Simon Horman
2015-01-17 1:14 ` Simon Horman
[not found] ` <20150117011414.GC397-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2015-01-17 14:12 ` Geert Uytterhoeven
2015-01-22 2:55 ` Simon Horman
2015-01-22 2:58 ` 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=1421237484-16847-7-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=devicetree@vger.kernel.org \
--cc=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/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).