From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Simon Horman <horms@verge.net.au>, Magnus Damm <magnus.damm@gmail.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Ulf Hansson <ulf.hansson@linaro.org>,
Kevin Hilman <khilman@linaro.org>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Philipp Zabel <philipp.zabel@gmail.com>,
Tomasz Figa <tomasz.figa@gmail.com>,
linux-sh@vger.kernel.org, linux-pm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH 2/7] ARM: shmobile: R-Mobile: Consolidate rmobile_pd_suspend_*()
Date: Wed, 19 Nov 2014 16:57:29 +0100 [thread overview]
Message-ID: <1416412654-6508-3-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1416412654-6508-1-git-send-email-geert+renesas@glider.be>
Consolidate the identical rmobile_pd_suspend_*() routines that just
return -EBUSY to prevent a PM domain from being powered down into a
single rmobile_pd_suspend_busy().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/pm-rmobile.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index 5e01a28110e24034..3d383d3dcd4ec640 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -209,11 +209,10 @@ void rmobile_add_devices_to_domains(struct pm_domain_device data[],
#else /* !CONFIG_ARCH_SHMOBILE_LEGACY */
-static int rmobile_pd_suspend_cpu(void)
+static int rmobile_pd_suspend_busy(void)
{
/*
- * This domain contains the CPU core and therefore it should
- * only be turned off if the CPU is not in use.
+ * This domain should not be turned off.
*/
return -EBUSY;
}
@@ -227,16 +226,6 @@ static int rmobile_pd_suspend_console(void)
return console_suspend_enabled ? 0 : -EBUSY;
}
-static int rmobile_pd_suspend_debug(void)
-{
- /*
- * This domain contains the Coresight-ETM hardware block and
- * therefore it should only be turned off if the debug module is
- * not in use.
- */
- return -EBUSY;
-}
-
#define MAX_NUM_CPU_PDS 8
static unsigned int num_cpu_pds __initdata;
@@ -310,17 +299,26 @@ static void __init rmobile_setup_pm_domain(struct device_node *np,
const char *name = pd->genpd.name;
if (pd_contains_cpu(np)) {
+ /*
+ * This domain contains the CPU core and therefore it should
+ * only be turned off if the CPU is not in use.
+ */
pr_debug("PM domain %s contains CPU\n", name);
pd->gov = &pm_domain_always_on_gov;
- pd->suspend = rmobile_pd_suspend_cpu;
+ pd->suspend = rmobile_pd_suspend_busy;
} else if (np == console_pd) {
pr_debug("PM domain %s contains serial console\n", name);
pd->gov = &pm_domain_always_on_gov;
pd->suspend = rmobile_pd_suspend_console;
} else if (np == debug_pd) {
+ /*
+ * This domain contains the Coresight-ETM hardware block and
+ * therefore it should only be turned off if the debug module is
+ * not in use.
+ */
pr_debug("PM domain %s contains Coresight-ETM\n", name);
pd->gov = &pm_domain_always_on_gov;
- pd->suspend = rmobile_pd_suspend_debug;
+ pd->suspend = rmobile_pd_suspend_busy;
}
rmobile_init_pm_domain(pd);
--
1.9.1
next prev parent reply other threads:[~2014-11-19 15:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 15:57 [PATCH RFC 0/7] ARM: shmobile: sh73a0: DT PM domain support Geert Uytterhoeven
2014-11-19 15:57 ` [PATCH 1/7] PM / Domains: Document SH-Mobile AG5 (sh73a0) binding Geert Uytterhoeven
2014-11-19 15:57 ` Geert Uytterhoeven [this message]
2014-11-19 15:57 ` [PATCH 3/7] ARM: shmobile: R-Mobile: Generalize adding/looking up special PM domains Geert Uytterhoeven
2014-11-19 15:57 ` [PATCH 4/7] ARM: shmobile: R-Mobile: Special-case PM domains containing SBSCs Geert Uytterhoeven
2014-11-19 15:57 ` [PATCH 5/7] [RFC] ARM: shmobile: sh73a0 dtsi: Add PM domain support Geert Uytterhoeven
2014-11-19 15:57 ` [PATCH 6/7] drivers: sh: Disable PM runtime for multi-platform sh73a0 with genpd Geert Uytterhoeven
2014-11-19 15:57 ` [PATCH 7/7] [RFC] ARM: shmobile: r8a7740 dtsi: Add missing memory-controller node 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=1416412654-6508-3-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).