[RFC,v5,3/8] ARM: s3c64xx: pm: Convert to multiple states

Commit Message

Axel Haslam April 24, 2015, 5:35 p.m. UTC

From: Axel Haslam <[e-mail]>

The generic power domain framework added structure changes
to support multiple intermediate states when powering off a domain.

These changes are needed to prevent compilation breaks with
the new structures.

Signed-off-by: Axel Haslam <[e-mail]>
---
 arch/arm/mach-s3c64xx/pm.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

Patch

diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index aaf7bea..446c5bd 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -85,12 +85,20 @@  static int s3c64xx_pd_on(struct generic_pm_domain *domain)
 	return 0;
 }
 
+struct genpd_power_state s3c64xx_pm_states[] = {
+	{
+		.name = "OFF",
+	}
+};
+
 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,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };
 
@@ -101,6 +109,8 @@  static struct s3c64xx_pm_domain s3c64xx_pm_etm = {
 	.pd = {
 		.power_off = s3c64xx_pd_off,
 		.power_on = s3c64xx_pd_on,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };
 
@@ -111,6 +121,8 @@  static struct s3c64xx_pm_domain s3c64xx_pm_s = {
 	.pd = {
 		.power_off = s3c64xx_pd_off,
 		.power_on = s3c64xx_pd_on,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };
 
@@ -121,6 +133,8 @@  static struct s3c64xx_pm_domain s3c64xx_pm_f = {
 	.pd = {
 		.power_off = s3c64xx_pd_off,
 		.power_on = s3c64xx_pd_on,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };
 
@@ -131,6 +145,8 @@  static struct s3c64xx_pm_domain s3c64xx_pm_p = {
 	.pd = {
 		.power_off = s3c64xx_pd_off,
 		.power_on = s3c64xx_pd_on,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };
 
@@ -141,6 +157,8 @@  static struct s3c64xx_pm_domain s3c64xx_pm_i = {
 	.pd = {
 		.power_off = s3c64xx_pd_off,
 		.power_on = s3c64xx_pd_on,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };
 
@@ -150,6 +168,8 @@  static struct s3c64xx_pm_domain s3c64xx_pm_g = {
 	.pd = {
 		.power_off = s3c64xx_pd_off,
 		.power_on = s3c64xx_pd_on,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };
 
@@ -160,6 +180,8 @@  static struct s3c64xx_pm_domain s3c64xx_pm_v = {
 	.pd = {
 		.power_off = s3c64xx_pd_off,
 		.power_on = s3c64xx_pd_on,
+		.states = s3c64xx_pm_states,
+		.state_count = ARRAY_SIZE(s3c64xx_pm_states),
 	},
 };