diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-16 20:50:08 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-16 20:50:08 (GMT) |
| commit | 62dc7c02c31c2cc66c46cc8761d421c60bb07a6f (patch) | |
| tree | 73068d760963dc8e154a4e54025e41a529c67b83 /arch | |
| parent | cf3bbcaf09cb158590d1a9e0c0a6796d4fe92452 (diff) | |
| parent | 57d13370cfaf6017c68981e66ff5b3bf20a2705c (diff) | |
| download | linux-62dc7c02c31c2cc66c46cc8761d421c60bb07a6f.tar.xz | |
Merge branch 'pm-domains'
* pm-domains:
PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on()
PM / shmobile: Make CMT driver use pm_genpd_dev_always_on()
PM / shmobile: Make TMU driver use pm_genpd_dev_always_on()
PM / Domains: Introduce "always on" device flag
PM / Domains: Fix hibernation restore of devices, v2
PM / Domains: Fix handling of wakeup devices during system resume
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-sh7372.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c index a83cf51..cccf91b 100644 --- a/arch/arm/mach-shmobile/setup-sh7372.c +++ b/arch/arm/mach-shmobile/setup-sh7372.c @@ -1043,6 +1043,8 @@ void __init sh7372_add_standard_devices(void) sh7372_add_device_to_domain(&sh7372_a4r, &veu2_device); sh7372_add_device_to_domain(&sh7372_a4r, &veu3_device); sh7372_add_device_to_domain(&sh7372_a4r, &jpu_device); + sh7372_add_device_to_domain(&sh7372_a4r, &tmu00_device); + sh7372_add_device_to_domain(&sh7372_a4r, &tmu01_device); } void __init sh7372_add_early_devices(void) |