summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/devices-common.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-09-09 17:40:38 +0530
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:07:27 +0200
commit531d3313d7b2d9d67c3294ef0412ff99003e4075 (patch)
treed00531bebe2e97a2d0bb5555f60f32fa46c13726 /arch/arm/mach-ux500/devices-common.c
parentddf435ff6e5bc88fa2229ceac799aa0189978257 (diff)
ux500: pm: runtime: upgrade to 3.0
Support for changes in: commit 4d27e9dcff00a6425d779b065ec8892e4f391661 Author: Rafael J. Wysocki <rjw@sisk.pl> Date: Fri Apr 29 00:35:50 2011 +0200 PM: Make power domain callbacks take precedence over subsystem ones Change the PM core's behavior related to power domains in such a way that, if a power domain is defined for a given device, its callbacks will be executed instead of and not in addition to the device subsystem's PM callbacks. The idle->suspend happened earlier via the bus level runtime_idle which called pm_generic_runtime_idle(). We now need a power domain callback to do the same thing because of the above commit. The separate domains for amba and platform are required because the legacy suspend/resume callbacks need to be called via these specific functions. Change-Id: I1214db3e4e68d277bf30c73ef5b8bfbe066172b4 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/devices-common.c')
-rw-r--r--arch/arm/mach-ux500/devices-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/devices-common.c b/arch/arm/mach-ux500/devices-common.c
index 7818d957e7c..b01af37020c 100644
--- a/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@ -44,7 +44,7 @@ dbx500_add_amba_device(const char *name, resource_size_t base,
dev->dma_mask = DMA_BIT_MASK(32);
dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
- dev->dev.pwr_domain = &ux500_dev_power_domain;
+ dev->dev.pwr_domain = &ux500_amba_dev_power_domain;
dev->irq[0] = irq;
dev->irq[1] = NO_IRQ;