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

diff --combined arch/arm/mach-shmobile/setup-sh7372.c
index a83cf51fc09906a13018472b4f563baebaf7bcb5,9f2d7f2b5374891c1f7eafa8882bd94a20aa75c0..cccf91b8fae196e56cf4770b078f0f08cda9b538
--- 1/arch/arm/mach-shmobile/setup-sh7372.c
--- 2/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@@ -662,7 -662,6 +662,7 @@@ static struct sh_dmae_pdata usb_dma0_pl
        .dmaor_is_32bit = 1,
        .needs_tend_set = 1,
        .no_dmars       = 1,
 +      .slave_only     = 1,
  };
  
  static struct resource sh7372_usb_dmae0_resources[] = {
@@@ -724,7 -723,6 +724,7 @@@ static struct sh_dmae_pdata usb_dma1_pl
        .dmaor_is_32bit = 1,
        .needs_tend_set = 1,
        .no_dmars       = 1,
 +      .slave_only     = 1,
  };
  
  static struct resource sh7372_usb_dmae1_resources[] = {
@@@ -1043,6 -1041,8 +1043,8 @@@ void __init sh7372_add_standard_devices
        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)