diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-09-09 02:04:24 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-09-09 02:04:24 +0400 |
| commit | d7eb67f7fef9c046f27a975118da2324de65a90c (patch) | |
| tree | d6ddda513ae56e6a4d56b087b10c7f1faa11ecb0 /arch/arm/mach-omap2/omap-mpuss-lowpower.c | |
| parent | 9a15fff05b702c3ea29ae64db0d3ff0355431eab (diff) | |
| parent | 3e6a1c945950140926dd6e2cc667893de0a7fe3b (diff) | |
| download | linux-d7eb67f7fef9c046f27a975118da2324de65a90c.tar.xz | |
Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent
Diffstat (limited to 'arch/arm/mach-omap2/omap-mpuss-lowpower.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index 4001325f90fb..e9cdacfe1923 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -298,6 +298,10 @@ int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state) if (omap_rev() == OMAP4430_REV_ES1_0) return -ENXIO; + /* Use the achievable power state for the domain */ + power_state = pwrdm_get_valid_lp_state(pm_info->pwrdm, + false, power_state); + if (power_state == PWRDM_POWER_OFF) cpu_state = 1; |