From patchwork Fri Apr 24 17:35:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6272671 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 AE5789F313 for ; Fri, 24 Apr 2015 17:36:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC0CB20377 for ; Fri, 24 Apr 2015 17:35:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54F5F20396 for ; Fri, 24 Apr 2015 17:35:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966740AbbDXRfw (ORCPT ); Fri, 24 Apr 2015 13:35:52 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:36635 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966672AbbDXRfw (ORCPT ); Fri, 24 Apr 2015 13:35:52 -0400 Received: by wizk4 with SMTP id k4so30408562wiz.1 for ; Fri, 24 Apr 2015 10:35:51 -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=dkekpYBU7WzUrCiiijLIJOfJmmcnqzglmlxNRmC0DU8=; b=XIttECXS4oSDoUtnbITkSG+SVGx9jyh4FreSQDurVagcvfifKQRj3DFGUeDOAq7Ynw 1SWqKQGwuWodZ3+PhxjyQ8uu7n3YFuwmUVvnpA7Me2PYXfj4IJ8OGAjhNAePrOrDGxuQ hOFBldn3S6YCLZMMq5bIi4cBs9T1qR4EtirSdLk25/YaqraZsTSagv/vm5GKVy/CuyJn X/Jn6Mm1QvnW5H7Nvbkx+ljziCc2R1U4k0I720bEym22jPdouu/SEXTAQpoAgL9IlY1P U4thO13f44+5+dfn9+zYLxc4VT+MNvuem5ZktKLv2wGHMOLA1PctGmFoM+ktEJveTB3z TESg== X-Gm-Message-State: ALoCoQnHYwU26gH9Dxo+2JOaCl5wFwPHODothYimo43hOAayka2BxoomAx7ismRWwF4bZc/En+7v X-Received: by 10.180.85.9 with SMTP id d9mr271798wiz.28.1429896951186; Fri, 24 Apr 2015 10:35:51 -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.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Apr 2015 10:35:50 -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 6/8] ARM: rmobile: pm: Convert to multiple states Date: Fri, 24 Apr 2015 19:35:22 +0200 Message-Id: <1429896924-21540-7-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-shmobile/pm-rmobile.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c index 9501820..038376c 100644 --- a/arch/arm/mach-shmobile/pm-rmobile.c +++ b/arch/arm/mach-shmobile/pm-rmobile.c @@ -148,6 +148,12 @@ static void rmobile_pd_detach_dev(struct generic_pm_domain *domain, pm_clk_destroy(dev); } +struct genpd_power_state rmobile_genpd_states[] = { + { + .name = "OFF", + } +}; + static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) { struct generic_pm_domain *genpd = &rmobile_pd->genpd; @@ -158,6 +164,8 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup; genpd->power_off = rmobile_pd_power_down; genpd->power_on = rmobile_pd_power_up; + genpd->states = rmobile_genpd_states; + genpd->state_count = ARRAY_SIZE(rmobile_genpd_states); genpd->attach_dev = rmobile_pd_attach_dev; genpd->detach_dev = rmobile_pd_detach_dev; __rmobile_pd_power_up(rmobile_pd, false);