From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Linux PM mailing list <linux-pm@lists.linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
Magnus Damm <magnus.damm@gmail.com>,
Paul Walmsley <paul@pwsan.com>, Kevin Hilman <khilman@ti.com>,
Alan Stern <stern@rowland.harvard.edu>,
LKML <linux-kernel@vger.kernel.org>,
linux-sh@vger.kernel.org
Subject: [PATCH 8/8] ARM / shmobile: Support for I/O PM domains for SH7372 (v5)
Date: Sat, 11 Jun 2011 20:40:11 +0000 [thread overview]
Message-ID: <201106112240.11621.rjw@sisk.pl> (raw)
In-Reply-To: <201106112223.04972.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
Use the generic power domains support introduced by the previous
patch to implement support for power domains on SH7372.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
arch/arm/mach-shmobile/Kconfig | 1
arch/arm/mach-shmobile/Makefile | 4 +
arch/arm/mach-shmobile/board-mackerel.c | 3 +
arch/arm/mach-shmobile/include/mach/sh7372.h | 16 +++++
arch/arm/mach-shmobile/pm-sh7372.c | 81 +++++++++++++++++++++++++++
5 files changed, 105 insertions(+)
Index: linux-2.6/arch/arm/mach-shmobile/board-mackerel.c
=================================--- linux-2.6.orig/arch/arm/mach-shmobile/board-mackerel.c
+++ linux-2.6/arch/arm/mach-shmobile/board-mackerel.c
@@ -1496,6 +1496,9 @@ static void __init mackerel_init(void)
platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
+ sh7372_add_device_to_domain(SH7372_A4LC, &lcdc_device);
+ sh7372_add_device_to_domain(SH7372_A4LC, &hdmi_lcdc_device);
+
hdmi_init_pm_clock();
sh7372_pm_init();
}
Index: linux-2.6/arch/arm/mach-shmobile/include/mach/sh7372.h
=================================--- linux-2.6.orig/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ linux-2.6/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -12,6 +12,7 @@
#define __ASM_SH7372_H__
#include <linux/sh_clk.h>
+#include <linux/pm_domain.h>
/*
* Pin Function Controller:
@@ -470,4 +471,19 @@ extern struct clk sh7372_fsibck_clk;
extern struct clk sh7372_fsidiva_clk;
extern struct clk sh7372_fsidivb_clk;
+struct platform_device;
+
+#ifdef CONFIG_PM
+extern struct generic_pm_domain sh7372_a4lc_domain;
+#define SH7372_A4LC (&sh7372_a4lc_domain)
+
+extern void sh7372_add_device_to_domain(struct generic_pm_domain *domain,
+ struct platform_device *pdev);
+#else
+#define SH7372_A4LC NULL
+
+static inline void sh7372_add_device_to_domain(struct generic_pm_domain *dom,
+ struct platform_device *pd) {}
+#endif /* CONFIG_PM */
+
#endif /* __ASM_SH7372_H__ */
Index: linux-2.6/arch/arm/mach-shmobile/Makefile
=================================--- linux-2.6.orig/arch/arm/mach-shmobile/Makefile
+++ linux-2.6/arch/arm/mach-shmobile/Makefile
@@ -42,6 +42,10 @@ obj-$(CONFIG_MACH_AP4EVB) += board-ap4ev
obj-$(CONFIG_MACH_AG5EVM) += board-ag5evm.o
obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
+# PM objects
+pm-$(CONFIG_ARCH_SH7372) += pm-sh7372.o
+
# Framework support
obj-$(CONFIG_SMP) += $(smp-y)
obj-$(CONFIG_GENERIC_GPIO) += $(pfc-y)
+obj-$(CONFIG_PM) += $(pm-y)
Index: linux-2.6/arch/arm/mach-shmobile/Kconfig
=================================--- linux-2.6.orig/arch/arm/mach-shmobile/Kconfig
+++ linux-2.6/arch/arm/mach-shmobile/Kconfig
@@ -19,6 +19,7 @@ config ARCH_SH7372
select CPU_V7
select SH_CLK_CPG
select ARCH_WANT_OPTIONAL_GPIOLIB
+ select PM_GENERIC_DOMAINS
config ARCH_SH73A0
bool "SH-Mobile AG5 (R8A73A00)"
Index: linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c
=================================--- linux-2.6.orig/arch/arm/mach-shmobile/pm-sh7372.c
+++ linux-2.6/arch/arm/mach-shmobile/pm-sh7372.c
@@ -15,16 +15,97 @@
#include <linux/list.h>
#include <linux/err.h>
#include <linux/slab.h>
+#include <linux/pm_runtime.h>
+#include <linux/platform_device.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <mach/common.h>
+#include <mach/sh7372.h>
#define SMFRAM 0xe6a70000
#define SYSTBCR 0xe6150024
#define SBAR 0xe6180020
#define APARMBAREA 0xe6f10020
+#define SPDCR 0xe6180008
+#define SWUCR 0xe6180014
+#define PSTR 0xe6180080
+
+struct sh7372_domain_data {
+ unsigned int bit_shift;
+};
+
+static int pd_power_down(struct dev_pm_domain *domain)
+{
+ struct sh7372_domain_data *dd = domain->platform_data;
+ unsigned int mask = 1 << dd->bit_shift;
+
+ if (__raw_readl(PSTR) & mask) {
+ __raw_writel(mask, SPDCR);
+
+ while (__raw_readl(SPDCR) & mask) {}
+
+ pr_debug("sh7372 power domain down 0x%08x -> PSTR = 0x%08x\n",
+ mask, __raw_readl(PSTR));
+ }
+
+ return 0;
+}
+
+static int pd_power_up(struct dev_pm_domain *domain)
+{
+ struct sh7372_domain_data *dd = domain->platform_data;
+ unsigned int mask = 1 << dd->bit_shift;
+
+ if (!(__raw_readl(PSTR) & mask)) {
+ __raw_writel(mask, SWUCR);
+
+ while (__raw_readl(SWUCR) & mask) {}
+
+ pr_debug("sh7372 power domain up 0x%08x -> PSTR = 0x%08x\n",
+ mask, __raw_readl(PSTR));
+ }
+
+ return 0;
+}
+
+static void sh7372_init_domain(struct generic_pm_domain *domain,
+ struct sh7372_domain_data *pdata)
+{
+ pm_genpd_init(domain, NULL, false);
+ domain->domain.platform_data = pdata;
+ domain->stop_device = pm_runtime_clk_suspend;
+ domain->start_device = pm_runtime_clk_resume;
+ domain->power_off = pd_power_down;
+ domain->power_on = pd_power_up;
+}
+
+void sh7372_add_device_to_domain(struct generic_pm_domain *domain,
+ struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+
+ if (!dev->power.subsys_data) {
+ pm_runtime_clk_init(dev);
+ pm_runtime_clk_add(dev, NULL);
+ }
+ pm_genpd_add_device(domain, dev);
+}
+
+static struct sh7372_domain_data sh7372_a4lc_domain_data = {
+ .bit_shift = 1,
+};
+
+struct generic_pm_domain sh7372_a4lc_domain;
+
+static int __init sh7372_power_domains_init(void)
+{
+ sh7372_init_domain(&sh7372_a4lc_domain, &sh7372_a4lc_domain_data);
+ return 0;
+}
+core_initcall(sh7372_power_domains_init);
+
static void sh7372_enter_core_standby(void)
{
void __iomem *smfram = (void __iomem *)SMFRAM;
next prev parent reply other threads:[~2011-06-11 20:40 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-11 20:23 [PATCH 0/8] PM / Domains: Support for generic I/O PM domains (v5) Rafael J. Wysocki
2011-06-11 20:25 ` [PATCH 1/8] PM / Domains: Update documentation Rafael J. Wysocki
2011-06-11 20:26 ` [PATCH 2/8] PM / Domains: Rename struct dev_power_domain to struct dev_pm_domain Rafael J. Wysocki
2011-06-20 23:37 ` Kevin Hilman
2011-06-11 20:27 ` [PATCH 3/8] PM: subsys_data in struct dev_pm_info need not depend on RM_RUNTIME Rafael J. Wysocki
2011-06-11 20:31 ` [PATCH 4/8] PM / Domains: Support for generic I/O PM domains (v5) Rafael J. Wysocki
2011-06-19 22:02 ` [Update][PATCH 4/8] PM / Domains: Support for generic I/O PM domains (v6) Rafael J. Wysocki
2011-06-21 17:42 ` Kevin Hilman
2011-06-22 0:07 ` Rafael J. Wysocki
2011-06-22 19:51 ` Kevin Hilman
2011-06-22 21:30 ` Rafael J. Wysocki
2011-06-11 20:36 ` [PATCH 5/8] PM: Introduce generic "noirq" callback routines for subsystems Rafael J. Wysocki
2011-06-11 20:37 ` [PATCH 6/8] PM / Domains: Move code from under #ifdef CONFIG_PM_RUNTIME Rafael J. Wysocki
2011-06-11 20:39 ` [PATCH 7/8] PM / Domains: System-wide transitions support for generic PM domains Rafael J. Wysocki
2011-06-11 23:28 ` [Update][PATCH 7/8] PM / Domains: System-wide transitions support for generic domains (v2) Rafael J. Wysocki
2011-06-23 14:19 ` [Update][PATCH 7/8] PM / Domains: System-wide transitions support Alan Stern
2011-06-23 14:44 ` [Update][PATCH 7/8] PM / Domains: System-wide transitions support for generic domains (v3) Rafael J. Wysocki
2011-06-23 15:11 ` [Update][PATCH 7/8] PM / Domains: System-wide transitions support Alan Stern
2011-06-23 17:41 ` [Update][PATCH 7/8] PM / Domains: System-wide transitions support for generic domains (v3) Rafael J. Wysocki
2011-06-23 18:22 ` [Update][PATCH 7/8] PM / Domains: System-wide transitions support Alan Stern
2011-06-23 21:03 ` [Update][PATCH 7/8] PM / Domains: System-wide transitions support for generic domains (v3) Rafael J. Wysocki
2011-06-19 22:06 ` Rafael J. Wysocki
2011-06-20 23:05 ` Rafael J. Wysocki
2011-06-22 21:50 ` Kevin Hilman
2011-06-22 22:16 ` Rafael J. Wysocki
2011-06-22 22:18 ` Kevin Hilman
2011-06-22 22:22 ` Rafael J. Wysocki
2011-06-23 13:57 ` [PATCH] PM / Runtime: Update documentation of interactions with system sleep Rafael J. Wysocki
2011-06-24 18:25 ` Kevin Hilman
2011-06-11 20:40 ` Rafael J. Wysocki [this message]
2011-06-14 13:12 ` [PATCH 8/8] ARM / shmobile: Support for I/O PM domains for SH7372 (v5) Magnus Damm
2011-06-14 21:16 ` Rafael J. Wysocki
2011-06-15 14:17 ` Magnus Damm
2011-06-15 23:06 ` Rafael J. Wysocki
2011-06-19 22:07 ` [Update][PATCH 8/8] ARM / shmobile: Support for I/O power domains for SH7372 (v6) Rafael J. Wysocki
2011-06-20 2:01 ` Paul Mundt
2011-06-20 22:30 ` Rafael J. Wysocki
2011-06-21 11:57 ` Rafael J. Wysocki
2011-06-21 12:47 ` Paul Mundt
2011-07-10 11:45 ` [PATCH 8/8] ARM / shmobile: Support for I/O PM domains for SH7372 (v5) Laurent Pinchart
2011-06-11 20:57 ` [PATCH 0/8] PM / Domains: Support for generic I/O PM domains (v5) Greg KH
2011-06-21 0:02 ` Kevin Hilman
2011-06-21 11:06 ` Rafael J. Wysocki
2011-06-21 14:47 ` [PATCH 0/8] PM / Domains: Support for generic I/O PM domains Kevin Hilman
2011-06-25 21:24 ` [PATCH 0/10 v6] " Rafael J. Wysocki
2011-06-25 21:24 ` [PATCH 1/10 v6] PM / Domains: Rename struct dev_power_domain to struct dev_pm_domain Rafael J. Wysocki
2011-06-25 21:25 ` [PATCH 2/10 v6] PM: subsys_data in struct dev_pm_info need not depend on RM_RUNTIME Rafael J. Wysocki
2011-06-25 21:26 ` [PATCH 3/10 v6] PM / Domains: Support for generic I/O PM domains (v7) Rafael J. Wysocki
2011-06-30 6:14 ` Ming Lei
2011-06-30 18:58 ` Rafael J. Wysocki
2011-07-01 18:11 ` Kevin Hilman
2011-07-01 20:03 ` Rafael J. Wysocki
2011-06-25 21:27 ` [PATCH 4/10 v6] PM: Introduce generic "noirq" callback routines for subsystems (v2) Rafael J. Wysocki
2011-06-25 21:27 ` [PATCH 5/10 v6] PM / Domains: Move code from under #ifdef CONFIG_PM_RUNTIME (v2) Rafael J. Wysocki
2011-06-25 21:28 ` [PATCH 6/10 v6] PM / Domains: System-wide transitions support for generic domains (v4) Rafael J. Wysocki
2011-06-28 23:44 ` [Update][PATCH 6/10] PM / Domains: System-wide transitions support for generic domains (v5) Rafael J. Wysocki
2011-07-08 0:29 ` Kevin Hilman
2011-07-08 9:24 ` Rafael J. Wysocki
2011-07-08 14:37 ` [Update][PATCH 6/10] PM / Domains: System-wide transitions Alan Stern
2011-07-08 17:20 ` [Update][PATCH 6/10] PM / Domains: System-wide transitions support for generic domains (v5) Kevin Hilman
2011-07-08 18:06 ` Rafael J. Wysocki
2011-07-08 19:24 ` Rafael J. Wysocki
2011-07-09 14:15 ` Rafael J. Wysocki
2011-07-11 15:37 ` Kevin Hilman
2011-07-11 19:39 ` Rafael J. Wysocki
2011-07-08 17:56 ` Rafael J. Wysocki
2011-06-25 21:29 ` [PATCH 7/10 v6] PM / Domains: Don't stop wakeup devices during system sleep transitions Rafael J. Wysocki
2011-06-29 23:50 ` Kevin Hilman
2011-06-30 19:37 ` Rafael J. Wysocki
2011-06-30 22:42 ` Kevin Hilman
2011-06-30 22:55 ` Rafael J. Wysocki
2011-06-30 23:14 ` Kevin Hilman
2011-06-30 23:28 ` Rafael J. Wysocki
2011-07-01 0:01 ` Kevin Hilman
2011-07-01 0:24 ` Rafael J. Wysocki
2011-07-01 14:34 ` Kevin Hilman
2011-06-30 23:25 ` Rafael J. Wysocki
2011-07-01 14:45 ` [PATCH 7/10 v6] PM / Domains: Don't stop wakeup devices during Alan Stern
2011-07-01 20:06 ` [PATCH 7/10 v6] PM / Domains: Don't stop wakeup devices during system sleep transitions Rafael J. Wysocki
2011-06-25 21:30 ` [PATCH 8/10 v6] PM: Allow the clocks management code to be used during system suspend Rafael J. Wysocki
2011-06-25 21:30 ` [PATCH 9/10 v6] PM: Rename clock management functions Rafael J. Wysocki
2011-06-25 21:31 ` [PATCH 10/10 v6] ARM / shmobile: Support for I/O power domains for SH7372 (v8) Rafael J. Wysocki
2011-06-27 4:07 ` [PATCH 10/10 v6] ARM / shmobile: Support for I/O power domains Magnus Damm
2011-06-27 19:25 ` [PATCH 10/10 v6] ARM / shmobile: Support for I/O power domains for SH7372 (v8) Rafael J. Wysocki
2011-06-27 23:21 ` [PATCH 10/10 v6] ARM / shmobile: Support for I/O power domains Magnus Damm
2011-06-28 10:08 ` [PATCH 10/10 v6] ARM / shmobile: Support for I/O power domains for SH7372 (v8) Rafael J. Wysocki
2011-07-01 18:27 ` [PATCH 0/10 v6] PM / Domains: Support for generic I/O PM domains Kevin Hilman
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=201106112240.11621.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=gregkh@suse.de \
--cc=khilman@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=paul@pwsan.com \
--cc=stern@rowland.harvard.edu \
/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