From patchwork Mon Apr 20 15:02:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6242721 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 84A9BBF4A6 for ; Mon, 20 Apr 2015 15:02:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DD5B20456 for ; Mon, 20 Apr 2015 15:02:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F08520465 for ; Mon, 20 Apr 2015 15:02:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751185AbbDTPCV (ORCPT ); Mon, 20 Apr 2015 11:02:21 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:35148 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753179AbbDTPCU (ORCPT ); Mon, 20 Apr 2015 11:02:20 -0400 Received: by widdi4 with SMTP id di4so102984637wid.0 for ; Mon, 20 Apr 2015 08:02:19 -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=H/oYZ2b2He6+RgHxMlGYiGh7Rd0mh3m3IBkZwAQRzzo3Tx3elifk741jYxIOm2XEbw oX0l2Ml9NIgnli9AR79pMmTmONZq1tokcLYTFHpJlZNRWB4kGid9hV9ykZhU8xhkq91j GKW44ekTBSA+K2J1EXWhNd+/5y/UeRNGomTakAHjSrjmLQaPgNxC2qU2Hn53qnnOPVW1 AbnCpn01E2DssG7e+1E9ChRVgssouGnIF/HXqB/9+iy9K9fCWIhuthvWGISfNmpsy2d8 QgtY6BF3vRP+LonP5yqgHL7jh1pojNx0hWAPp5VFSE6zWrSszu6YZFLw0to3D/3O3xAh ZViw== X-Gm-Message-State: ALoCoQkGvKunlV+eGqJt1qnULFN5Vl7KO8gkzQUA6s0BwlciQ7yyAR/RSu2fKEomvKSrJulknQqF X-Received: by 10.194.61.208 with SMTP id s16mr20618752wjr.135.1429542139286; Mon, 20 Apr 2015 08:02:19 -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 fm8sm11119190wib.9.2015.04.20.08.02.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Apr 2015 08:02:18 -0700 (PDT) From: ahaslam@baylibre.com To: ulf.hansson@linaro.org, khilman@linaro.org, rjw@rjwysocki.net Cc: bcousson@baylibre.com, linux-pm@vger.kernel.org, Axel Haslam Subject: [PATCH] ARM: s3c64xx: pm: Convert to multiple states Date: Mon, 20 Apr 2015 17:02:04 +0200 Message-Id: <1429542128-21021-4-git-send-email-ahaslam@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429542128-21021-1-git-send-email-ahaslam@baylibre.com> References: <1429542128-21021-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=unavailable 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, + } }, };