From patchwork Fri Apr 24 17:35:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6272641 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 6DF989F398 for ; Fri, 24 Apr 2015 17:35:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E1C52038C for ; Fri, 24 Apr 2015 17:35:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8123620382 for ; Fri, 24 Apr 2015 17:35:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966362AbbDXRfr (ORCPT ); Fri, 24 Apr 2015 13:35:47 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:35799 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966672AbbDXRfq (ORCPT ); Fri, 24 Apr 2015 13:35:46 -0400 Received: by widdi4 with SMTP id di4so30381544wid.0 for ; Fri, 24 Apr 2015 10:35:45 -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=15iRJLx4aj/j+LOUQySMh9aDZNSh1/OmSBIa7L6P+Zo=; b=WUrAuccp5Ow4FpVFiqJWlMdODJT8TXjFnbd5VENzs7huIi9EOFm25enZnW0RGXVD+k 1ba63cd98/xsXrGoFYwz6ds5czHrPd3J8Vh+lKE2NQLhBF/eZDwf1hdKXgTtGziDMzDC mezfpPEdjBU1JYFJ5FDm0TlHqjMNgk5Mb0IVgkt0EQcQ/3n/I/Uc6onBpt8ZSPFHfG0n OZNdK6kLhIze18zFJalzYRloRGCB/1Ft3hVxdgE0vcgHhkabSNgs60944WHcvXP9fQp2 uahj+3yPzeH0yP29KkIOdeazaPfVc4VXvG16I8E1zn37x5kBQEyTTENThqyjSxMhkJFA o8FQ== X-Gm-Message-State: ALoCoQlBPRjk8Fc2qMyxly40OBviA7Df29dSf1CEu9vmcriUnLNN6wmXrttJ9srA1mZS53057TFJ X-Received: by 10.194.77.180 with SMTP id t20mr18132503wjw.115.1429896945649; Fri, 24 Apr 2015 10:35:45 -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 n3sm177488wix.1.2015.04.24.10.35.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Apr 2015 10:35:44 -0700 (PDT) From: ahaslam@baylibre.com To: ulf.hansson@linaro.org, khilman@linaro.org, k.kozlowski.k@gmail.com, geert@linux-m68k.org, rjw@rjwysocki.net Cc: bcousson@baylibre.com, linux-pm@vger.kernel.org, Axel Haslam Subject: [RFC v5 3/8] ARM: s3c64xx: pm: Convert to multiple states Date: Fri, 24 Apr 2015 19:35:19 +0200 Message-Id: <1429896924-21540-4-git-send-email-ahaslam@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429896924-21540-1-git-send-email-ahaslam@baylibre.com> References: <1429896924-21540-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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) 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), }, };