From patchwork Wed Apr 22 09:45:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6255421 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1121F9F440 for ; Wed, 22 Apr 2015 09:46:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F89C202E9 for ; Wed, 22 Apr 2015 09:46:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11EF4202FF for ; Wed, 22 Apr 2015 09:46:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964842AbbDVJqc (ORCPT ); Wed, 22 Apr 2015 05:46:32 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:34556 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965019AbbDVJqb (ORCPT ); Wed, 22 Apr 2015 05:46:31 -0400 Received: by wgso17 with SMTP id o17so240776215wgs.1 for ; Wed, 22 Apr 2015 02:46:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iP211vd+FKXEIQe8CNoYhTq0jYMQpCUhJ9wocjotl+s=; b=AZ4GBowGZQ3Hx3PdZrw6eVcf+FmYyp38nuyKBeHwmuegaaWsv+9it0k+DqwlJAdxhm wGZ/vZIrmqVp2GsTTvN129vvUi9+inLjdbRELnRSJ5ogCv/1x/dEmh64lC99e/pnXap/ IoR7ng1QteyWvNq8kLBRtfsOTnH9I528MftjI9mDikfwg3gP2Ou+7/cXvpJTSL7eAURe zTXf6ywxkVIeC9iuEjTI+GTlJqitO9TtDVTDr2MZPupJEr/y+/qwUxaQs/BBM6wQF4ak VcBK+NNQoyEoIgJZah/yk2sgcURFqfjwCsRtLY4pe73kgn2lpcEGf9mC3leYbBdobc+5 NuZQ== X-Gm-Message-State: ALoCoQkssgQU5mMwwJeeSaH5Lu+WSHs+7kTpW/yduQlrFAiGLUzj2c0KnB0TThn5QLxXMTktDOL0 X-Received: by 10.180.104.225 with SMTP id gh1mr4195096wib.65.1429695990568; Wed, 22 Apr 2015 02:46:30 -0700 (PDT) Received: from axelh-ThinkPad-T440s.home (LPoitiers-656-1-62-228.w90-63.abo.wanadoo.fr. [90.63.143.228]) by mx.google.com with ESMTPSA id mc20sm6954975wic.15.2015.04.22.02.46.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Apr 2015 02:46:29 -0700 (PDT) From: ahaslam@baylibre.com To: ulf.hansson@linaro.org, khilman@linaro.org, k.kozlowski.k@gmail.com, rjw@rjwysocki.net Cc: bcousson@baylibre.com, linux-pm@vger.kernel.org, Axel Haslam Subject: [RFC v4 3/8] ARM: s3c64xx: pm: Convert to multiple states Date: Wed, 22 Apr 2015 11:45:30 +0200 Message-Id: <1429695935-15815-4-git-send-email-ahaslam@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429695935-15815-1-git-send-email-ahaslam@baylibre.com> References: <1429695935-15815-1-git-send-email-ahaslam@baylibre.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Axel Haslam 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 --- arch/arm/mach-s3c64xx/pm.c | 57 +++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c index aaf7bea..8536d14 100644 --- a/arch/arm/mach-s3c64xx/pm.c +++ b/arch/arm/mach-s3c64xx/pm.c @@ -89,8 +89,12 @@ 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[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + }, + .state_count = 1, }, }; @@ -99,8 +103,11 @@ static struct s3c64xx_pm_domain s3c64xx_pm_etm = { .ena = S3C64XX_NORMALCFG_DOMAIN_ETM_ON, .pwr_stat = S3C64XX_BLKPWRSTAT_ETM, .pd = { - .power_off = s3c64xx_pd_off, - .power_on = s3c64xx_pd_on, + .states[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + } }, }; @@ -109,8 +116,11 @@ static struct s3c64xx_pm_domain s3c64xx_pm_s = { .ena = S3C64XX_NORMALCFG_DOMAIN_S_ON, .pwr_stat = S3C64XX_BLKPWRSTAT_S, .pd = { - .power_off = s3c64xx_pd_off, - .power_on = s3c64xx_pd_on, + .states[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + } }, }; @@ -119,8 +129,11 @@ static struct s3c64xx_pm_domain s3c64xx_pm_f = { .ena = S3C64XX_NORMALCFG_DOMAIN_F_ON, .pwr_stat = S3C64XX_BLKPWRSTAT_F, .pd = { - .power_off = s3c64xx_pd_off, - .power_on = s3c64xx_pd_on, + .states[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + } }, }; @@ -129,8 +142,11 @@ static struct s3c64xx_pm_domain s3c64xx_pm_p = { .ena = S3C64XX_NORMALCFG_DOMAIN_P_ON, .pwr_stat = S3C64XX_BLKPWRSTAT_P, .pd = { - .power_off = s3c64xx_pd_off, - .power_on = s3c64xx_pd_on, + .states[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + } }, }; @@ -139,8 +155,11 @@ static struct s3c64xx_pm_domain s3c64xx_pm_i = { .ena = S3C64XX_NORMALCFG_DOMAIN_I_ON, .pwr_stat = S3C64XX_BLKPWRSTAT_I, .pd = { - .power_off = s3c64xx_pd_off, - .power_on = s3c64xx_pd_on, + .states[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + } }, }; @@ -148,8 +167,11 @@ 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, + .states[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + } }, }; @@ -158,8 +180,11 @@ static struct s3c64xx_pm_domain s3c64xx_pm_v = { .ena = S3C64XX_NORMALCFG_DOMAIN_V_ON, .pwr_stat = S3C64XX_BLKPWRSTAT_V, .pd = { - .power_off = s3c64xx_pd_off, - .power_on = s3c64xx_pd_on, + .states[0] = { + .name = "off", + .power_off = s3c64xx_pd_off, + .power_on = s3c64xx_pd_on, + } }, };