diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-17 10:07:31 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:11 +0200 |
| commit | 1c5dacbf630cd762e1f0c8862112d234beabed97 (patch) | |
| tree | dea7b9e14a5040721ecdc2431f129356dfd860a6 /arch | |
| parent | c60b00e798b775cca5e43c735d01b944a79d358d (diff) | |
mach-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.
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ux500/devices-common.c | 2 |
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 b93b8c9a78c..1e9bf0c584a 100644 --- a/arch/arm/mach-ux500/devices-common.c +++ b/arch/arm/mach-ux500/devices-common.c @@ -35,7 +35,7 @@ dbx500_add_amba_device(struct device *parent, const char *name, 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; |