From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH] ARM: shmobile: Partial build of pm-rmobile.c for multiplatform
Date: Fri, 08 Aug 2014 10:59:23 +0000 [thread overview]
Message-ID: <20140808105923.2628.30007.sendpatchset@w520> (raw)
From: Magnus Damm <damm+renesas@opensource.se>
Disconnect Multiplatform PM domain enablement and
SoC specific Multiplatform enablement by allowing
to build pm-rmobile.c with parts of it disabled.
This way it is possible to start using r8a7740
with Multiplatform before PM domain DT is ready.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
Built on top of renesas-devel-v3.16-20140808
arch/arm/mach-shmobile/pm-rmobile.c | 4 ++--
arch/arm/mach-shmobile/pm-rmobile.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- 0001/arch/arm/mach-shmobile/pm-rmobile.c
+++ work/arch/arm/mach-shmobile/pm-rmobile.c 2014-08-07 15:36:40.000000000 +0900
@@ -27,7 +27,7 @@
#define PSTR_RETRIES 100
#define PSTR_DELAY_US 10
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
static int rmobile_pd_power_down(struct generic_pm_domain *genpd)
{
struct rmobile_pm_domain *rmobile_pd = to_rmobile_pd(genpd);
@@ -151,4 +151,4 @@ void rmobile_add_devices_to_domains(stru
rmobile_add_device_to_domain_td(data[j].domain_name,
data[j].pdev, &latencies);
}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
--- 0001/arch/arm/mach-shmobile/pm-rmobile.h
+++ work/arch/arm/mach-shmobile/pm-rmobile.h 2014-08-07 15:34:58.000000000 +0900
@@ -36,7 +36,7 @@ struct pm_domain_device {
struct platform_device *pdev;
};
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && !defined(CONFIG_ARCH_MULTIPLATFORM)
extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num);
extern void rmobile_add_device_to_domain_td(const char *domain_name,
struct platform_device *pdev,
@@ -58,6 +58,6 @@ extern void rmobile_add_devices_to_domai
static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[],
int size) {}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM && !CONFIG_ARCH_MULTIPLATFORM */
#endif /* PM_RMOBILE_H */
next reply other threads:[~2014-08-08 10:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 10:59 Magnus Damm [this message]
2014-08-11 1:03 ` [PATCH] ARM: shmobile: Partial build of pm-rmobile.c for multiplatform 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=20140808105923.2628.30007.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-sh@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.