Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c28b56b1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-domains' into pm-for-linus 

* pm-domains:
  PM / Domains: Split device PM domain data into base and need_restore
  ARM: mach-shmobile: sh7372 sleep warning fixes
  ARM: mach-shmobile: sh7372 A3SM support
  ARM: mach-shmobile: sh7372 generic suspend/resume support
  PM / Domains: Preliminary support for devices with power.irq_safe set
  PM: Move clock-related definitions and headers to separate file
  PM / Domains: Use power.sybsys_data to reduce overhead
  PM: Reference counting of power.subsys_data
  PM: Introduce struct pm_subsys_data
  ARM / shmobile: Make A3RV be a subdomain of A4LC on SH7372
  PM / Domains: Rename argument of pm_genpd_add_subdomain()
  PM / Domains: Rename GPD_STATE_WAIT_PARENT to GPD_STATE_WAIT_MASTER
  PM / Domains: Allow generic PM domains to have multiple masters
  PM / Domains: Add "wait for parent" status for generic PM domains
  PM / Domains: Make pm_genpd_poweron() always survive parent removal
  PM / Domains: Do not take parent locks to modify subdomain counters
  PM / Domains: Implement subdomain counters as atomic fields
parents d727b606 cd0ea672

arch/arm/mach-omap1/pm_bus.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/kernel.h>

#include <linux/io.h>

#include <linux/pm_runtime.h>

#include <linux/pm_clock.h>

#include <linux/platform_device.h>

#include <linux/mutex.h>

#include <linux/clk.h>

arch/arm/mach-shmobile/board-ap4evb.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/leds.h>

#include <linux/input/sh_keysc.h>

#include <linux/usb/r8a66597.h>

#include <linux/pm_clock.h>



#include <media/sh_mobile_ceu.h>

#include <media/sh_mobile_csi2.h>

arch/arm/mach-shmobile/board-mackerel.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/pm_runtime.h>

#include <linux/pm_clock.h>

#include <linux/smsc911x.h>

#include <linux/sh_intc.h>

#include <linux/tca6416_keypad.h>

arch/arm/mach-shmobile/include/mach/common.h

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ extern void sh7372_add_standard_devices(void); 
extern void sh7372_clock_init(void);

extern void sh7372_pinmux_init(void);

extern void sh7372_pm_init(void);

extern void sh7372_cpu_suspend(void);

extern void sh7372_cpu_resume(void);

extern void sh7372_resume_core_standby_a3sm(void);

extern int sh7372_do_idle_a3sm(unsigned long unused);

extern struct clk sh7372_extal1_clk;

extern struct clk sh7372_extal2_clk;

arch/arm/mach-shmobile/include/mach/sh7372.h

+3 −0
Original line number Diff line number Diff line
@@ -498,9 +498,12 @@ extern struct sh7372_pm_domain sh7372_a3sg; 
extern void sh7372_init_pm_domain(struct sh7372_pm_domain *sh7372_pd);

extern void sh7372_add_device_to_domain(struct sh7372_pm_domain *sh7372_pd,

					struct platform_device *pdev);

extern void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd,

				    struct sh7372_pm_domain *sh7372_sd);

#else

#define sh7372_init_pm_domain(pd) do { } while(0)

#define sh7372_add_device_to_domain(pd, pdev) do { } while(0)

#define sh7372_pm_add_subdomain(pd, sd) do { } while(0)

#endif /* CONFIG_PM */



#endif /* __ASM_SH7372_H__ */