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

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

* pm-domains:
  PM / shmobile: Allow the A4R domain to be turned off at run time
  PM / input / touchscreen: Make st1232 use device PM QoS constraints
  PM / QoS: Introduce dev_pm_qos_add_ancestor_request()
  PM / shmobile: Remove the stay_on flag from SH7372's PM domains
  PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume
  PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode
  ARM: S3C64XX: Implement basic power domain support
  PM / shmobile: Use common always on power domain governor
  PM / Domains: Provide an always on power domain governor
  PM / Domains: Fix default system suspend/resume operations
  PM / Domains: Make it possible to assign names to generic PM domains
  PM / Domains: fix compilation failure for CONFIG_PM_GENERIC_DOMAINS unset
  PM / Domains: Automatically update overoptimistic latency information
  PM / Domains: Add default power off governor function (v4)
  PM / Domains: Add device stop governor function (v4)
  PM / Domains: Rework system suspend callback routines (v2)
  PM / Domains: Introduce "save/restore state" device callbacks
  PM / Domains: Make it possible to use per-device domain callbacks
parents 0015afaa a8cf27be

arch/arm/mach-s3c64xx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ config PLAT_S3C64XX 
	bool

	depends on ARCH_S3C64XX

	select SAMSUNG_WAKEMASK

	select PM_GENERIC_DOMAINS

	default y

	help

	  Base platform code for any Samsung S3C64XX device

arch/arm/mach-s3c64xx/mach-crag6410.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static void __init crag6410_machine_init(void) 


	regulator_has_full_constraints();



	s3c_pm_init();

	s3c64xx_pm_init();

}



MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")

arch/arm/mach-s3c64xx/pm.c

+174 −2
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
#include <linux/serial_core.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/pm_domain.h>



#include <mach/map.h>

#include <mach/irqs.h>



#include <plat/devs.h>

#include <plat/pm.h>

#include <plat/wakeup-mask.h>
@@ -31,6 +33,148 @@ 
#include <mach/regs-gpio-memport.h>

#include <mach/regs-modem.h>



struct s3c64xx_pm_domain {

	char *const name;

	u32 ena;

	u32 pwr_stat;

	struct generic_pm_domain pd;

};



static int s3c64xx_pd_off(struct generic_pm_domain *domain)

{

	struct s3c64xx_pm_domain *pd;

	u32 val;



	pd = container_of(domain, struct s3c64xx_pm_domain, pd);



	val = __raw_readl(S3C64XX_NORMAL_CFG);

	val &= ~(pd->ena);

	__raw_writel(val, S3C64XX_NORMAL_CFG);



	return 0;

}



static int s3c64xx_pd_on(struct generic_pm_domain *domain)

{

	struct s3c64xx_pm_domain *pd;

	u32 val;

	long retry = 1000000L;



	pd = container_of(domain, struct s3c64xx_pm_domain, pd);



	val = __raw_readl(S3C64XX_NORMAL_CFG);

	val |= pd->ena;

	__raw_writel(val, S3C64XX_NORMAL_CFG);



	/* Not all domains provide power status readback */

	if (pd->pwr_stat) {

		do {

			cpu_relax();

			if (__raw_readl(S3C64XX_BLK_PWR_STAT) & pd->pwr_stat)

				break;

		} while (retry--);



		if (!retry) {

			pr_err("Failed to start domain %s\n", pd->name);

			return -EBUSY;

		}

	}



	return 0;

}



static struct s3c64xx_pm_domain s3c64xx_pm_irom = {

	.name = "IROM",

	.ena = S3C64XX_NORMALCFG_IROM_ON,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain s3c64xx_pm_etm = {

	.name = "ETM",

	.ena = S3C64XX_NORMALCFG_DOMAIN_ETM_ON,

	.pwr_stat = S3C64XX_BLKPWRSTAT_ETM,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain s3c64xx_pm_s = {

	.name = "S",

	.ena = S3C64XX_NORMALCFG_DOMAIN_S_ON,

	.pwr_stat = S3C64XX_BLKPWRSTAT_S,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain s3c64xx_pm_f = {

	.name = "F",

	.ena = S3C64XX_NORMALCFG_DOMAIN_F_ON,

	.pwr_stat = S3C64XX_BLKPWRSTAT_F,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain s3c64xx_pm_p = {

	.name = "P",

	.ena = S3C64XX_NORMALCFG_DOMAIN_P_ON,

	.pwr_stat = S3C64XX_BLKPWRSTAT_P,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain s3c64xx_pm_i = {

	.name = "I",

	.ena = S3C64XX_NORMALCFG_DOMAIN_I_ON,

	.pwr_stat = S3C64XX_BLKPWRSTAT_I,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain s3c64xx_pm_g = {

	.name = "G",

	.ena = S3C64XX_NORMALCFG_DOMAIN_G_ON,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain s3c64xx_pm_v = {

	.name = "V",

	.ena = S3C64XX_NORMALCFG_DOMAIN_V_ON,

	.pwr_stat = S3C64XX_BLKPWRSTAT_V,

	.pd = {

		.power_off = s3c64xx_pd_off,

		.power_on = s3c64xx_pd_on,

	},

};



static struct s3c64xx_pm_domain *s3c64xx_always_on_pm_domains[] = {

	&s3c64xx_pm_irom,

};



static struct s3c64xx_pm_domain *s3c64xx_pm_domains[] = {

	&s3c64xx_pm_etm,

	&s3c64xx_pm_g,

	&s3c64xx_pm_v,

	&s3c64xx_pm_i,

	&s3c64xx_pm_p,

	&s3c64xx_pm_s,

	&s3c64xx_pm_f,

};



#ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK

void s3c_pm_debug_smdkled(u32 set, u32 clear)

{
@@ -89,6 +233,8 @@ static struct sleep_save misc_save[] = { 


	SAVE_ITEM(S3C64XX_SDMA_SEL),

	SAVE_ITEM(S3C64XX_MODEM_MIFPCON),



	SAVE_ITEM(S3C64XX_NORMAL_CFG),

};



void s3c_pm_configure_extint(void)
@@ -179,7 +325,26 @@ static void s3c64xx_pm_prepare(void) 
	__raw_writel(__raw_readl(S3C64XX_WAKEUP_STAT), S3C64XX_WAKEUP_STAT);

}



static int s3c64xx_pm_init(void)

int __init s3c64xx_pm_init(void)

{

	int i;



	s3c_pm_init();



	for (i = 0; i < ARRAY_SIZE(s3c64xx_always_on_pm_domains); i++)

		pm_genpd_init(&s3c64xx_always_on_pm_domains[i]->pd,

			      &pm_domain_always_on_gov, false);



	for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++)

		pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false);



	if (dev_get_platdata(&s3c_device_fb.dev))

		pm_genpd_add_device(&s3c64xx_pm_f.pd, &s3c_device_fb.dev);



	return 0;

}



static __init int s3c64xx_pm_initcall(void)

{

	pm_cpu_prep = s3c64xx_pm_prepare;

	pm_cpu_sleep = s3c64xx_cpu_suspend;
@@ -198,5 +363,12 @@ static int s3c64xx_pm_init(void) 


	return 0;

}

arch_initcall(s3c64xx_pm_initcall);



static __init int s3c64xx_pm_late_initcall(void)

{

	pm_genpd_poweroff_unused();



arch_initcall(s3c64xx_pm_init);
 
	return 0;

}

late_initcall(s3c64xx_pm_late_initcall);

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_resume_core_standby_a3sm(void);

extern int sh7372_do_idle_a3sm(unsigned long unused);

extern void sh7372_resume_core_standby_sysc(void);

extern int sh7372_do_idle_sysc(unsigned long sleep_mode);

extern struct clk sh7372_extal1_clk;

extern struct clk sh7372_extal2_clk;

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

+4 −2
Original line number Diff line number Diff line
@@ -480,11 +480,10 @@ struct platform_device; 
struct sh7372_pm_domain {

	struct generic_pm_domain genpd;

	struct dev_power_governor *gov;

	void (*suspend)(void);

	int (*suspend)(void);

	void (*resume)(void);

	unsigned int bit_shift;

	bool no_debug;

	bool stay_on;

};



static inline struct sh7372_pm_domain *to_sh7372_pd(struct generic_pm_domain *d)
@@ -499,6 +498,7 @@ extern struct sh7372_pm_domain sh7372_d4; 
extern struct sh7372_pm_domain sh7372_a4r;

extern struct sh7372_pm_domain sh7372_a3rv;

extern struct sh7372_pm_domain sh7372_a3ri;

extern struct sh7372_pm_domain sh7372_a4s;

extern struct sh7372_pm_domain sh7372_a3sp;

extern struct sh7372_pm_domain sh7372_a3sg;
@@ -515,5 +515,7 @@ extern void sh7372_pm_add_subdomain(struct sh7372_pm_domain *sh7372_pd, 


extern void sh7372_intcs_suspend(void);

extern void sh7372_intcs_resume(void);

extern void sh7372_intca_suspend(void);

extern void sh7372_intca_resume(void);



#endif /* __ASM_SH7372_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE