From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tomasz Figa Subject: [PATCH RFC 02/10] ARM: s3c64xx: pm: Add always_on field to s3c64xx_pm_domain struct Date: Sat, 11 Jan 2014 20:42:44 +0100 Message-ID: <1389469372-17199-3-git-send-email-tomasz.figa@gmail.com> References: <1389469372-17199-1-git-send-email-tomasz.figa@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1389469372-17199-1-git-send-email-tomasz.figa@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-pm@vger.kernel.org Cc: Mark Rutland , devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Russell King , Pawel Moll , Len Brown , Greg Kroah-Hartman , Tomasz Figa , Ian Campbell , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Rob Herring , Tomasz Figa , Bartlomiej Zolnierkiewicz , Kukjin Kim , Pavel Machek , Kumar Gala , Stephen Warren , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org This patch adds always_on field to s3c64xx_pm_domain struct to allow handling registration of all domains in the same way, without the need to have separate arrays for normal and always on domains. Signed-off-by: Tomasz Figa --- arch/arm/mach-s3c64xx/pm.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c index 5238d66..605bfa9 100644 --- a/arch/arm/mach-s3c64xx/pm.c +++ b/arch/arm/mach-s3c64xx/pm.c @@ -35,6 +35,7 @@ #include "regs-syscon-power.h" struct s3c64xx_pm_domain { + bool always_on; u32 ena; u32 pwr_stat; struct generic_pm_domain pd; @@ -84,6 +85,7 @@ static int s3c64xx_pd_on(struct generic_pm_domain *domain) } static struct s3c64xx_pm_domain s3c64xx_pm_irom = { + .always_on = true, .ena = S3C64XX_NORMALCFG_IROM_ON, .pd = { .name = "domain_irom", @@ -161,11 +163,8 @@ static struct s3c64xx_pm_domain s3c64xx_pm_v = { }, }; -static struct s3c64xx_pm_domain *s3c64xx_always_on_pm_domains[] = { - &s3c64xx_pm_irom, -}; - static struct s3c64xx_pm_domain *s3c64xx_pm_domains[] = { + &s3c64xx_pm_irom, &s3c64xx_pm_etm, &s3c64xx_pm_g, &s3c64xx_pm_v, @@ -311,12 +310,16 @@ int __init s3c64xx_pm_init(void) 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); + for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++) { + struct s3c64xx_pm_domain *pd = s3c64xx_pm_domains[i]; + struct dev_power_governor *gov = NULL; + + if (pd->always_on) + gov = &pm_domain_always_on_gov; + + pm_genpd_init(&pd->pd, gov, false); + } #ifdef CONFIG_S3C_DEV_FB if (dev_get_platdata(&s3c_device_fb.dev)) -- 1.8.5.2