git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
pm_runtime.c
diff --git
a/arch/arm/mach-shmobile/pm_runtime.c
b/arch/arm/mach-shmobile/pm_runtime.c
index
2d1b67a
..
6ec454e
100644
(file)
--- a/
arch/arm/mach-shmobile/pm_runtime.c
+++ b/
arch/arm/mach-shmobile/pm_runtime.c
@@
-14,6
+14,7
@@
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
+#include <linux/pm_domain.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/sh_clk.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
#include <linux/sh_clk.h>
@@
-28,31
+29,38
@@
static int default_platform_runtime_idle(struct device *dev)
return pm_runtime_suspend(dev);
}
return pm_runtime_suspend(dev);
}
-static struct dev_p
ower_domain default_power
_domain = {
+static struct dev_p
m_domain default_pm
_domain = {
.ops = {
.ops = {
- .runtime_suspend = pm_
runtime_
clk_suspend,
- .runtime_resume = pm_
runtime_
clk_resume,
+ .runtime_suspend = pm_clk_suspend,
+ .runtime_resume = pm_clk_resume,
.runtime_idle = default_platform_runtime_idle,
USE_PLATFORM_PM_SLEEP_OPS
},
};
.runtime_idle = default_platform_runtime_idle,
USE_PLATFORM_PM_SLEEP_OPS
},
};
-#define DEFAULT_P
WR_DOMAIN_PTR (&default_power
_domain)
+#define DEFAULT_P
M_DOMAIN_PTR (&default_pm
_domain)
#else
#else
-#define DEFAULT_P
WR_DOMAIN_PTR
NULL
+#define DEFAULT_P
M_DOMAIN_PTR
NULL
#endif /* CONFIG_PM_RUNTIME */
static struct pm_clk_notifier_block platform_bus_notifier = {
#endif /* CONFIG_PM_RUNTIME */
static struct pm_clk_notifier_block platform_bus_notifier = {
- .p
wr_domain = DEFAULT_PWR
_DOMAIN_PTR,
+ .p
m_domain = DEFAULT_PM
_DOMAIN_PTR,
.con_ids = { NULL, },
};
static int __init sh_pm_runtime_init(void)
{
.con_ids = { NULL, },
};
static int __init sh_pm_runtime_init(void)
{
- pm_
runtime_
clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
+ pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
return 0;
}
core_initcall(sh_pm_runtime_init);
return 0;
}
core_initcall(sh_pm_runtime_init);
+
+static int __init sh_pm_runtime_late_init(void)
+{
+ pm_genpd_poweroff_unused();
+ return 0;
+}
+late_initcall(sh_pm_runtime_late_init);