From patchwork Wed Apr 22 09:45:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6255461 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 9FC569F1C4 for ; Wed, 22 Apr 2015 09:46:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC524202FF for ; Wed, 22 Apr 2015 09:46:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1267A20303 for ; Wed, 22 Apr 2015 09:46:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965925AbbDVJqj (ORCPT ); Wed, 22 Apr 2015 05:46:39 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:33612 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965019AbbDVJqi (ORCPT ); Wed, 22 Apr 2015 05:46:38 -0400 Received: by wiax7 with SMTP id x7so125988052wia.0 for ; Wed, 22 Apr 2015 02:46:37 -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=ZWxp+I4+cyepHEjxdPIvB8xvr42UpeB1AfAK7GFq1dY=; b=iUzwH7KknMJPanS5GkLm8+3rv1deIkXzxih9oNIBpxsZmpaI3a4ZttIf3xIg2UKwIe 5wkekVzNdclaolF9TrBRskLzR+NzsJSheTabbZ9NCxB0J67oZuqDvegubETxLW/H8BCH 4i5UXrtRyfbt1kcPVCk96TJ54hpFxpwajkr+3kqmhXma8JSdQ84JUlCvVfucoJtt/Vxt caOBFUBhPu2KvwdVRTcO+yzX+3J6McqFMtvujz7LzWXlv226hbu0Cp2DTy9X04pdq6wD QV+7X4JTenSm0P8XhBxrkuIaXOKnhX/NSAITXQdL4L4QJ1SZpvRbMBV+qrRknR3Pp5TL Qoug== X-Gm-Message-State: ALoCoQkXfLivRuEeUJXdj/wYXNP/zSkh4MjtQBsxkP9loOChZ3a0YEbFXD0oeJ+opAHtPa5RjFlK X-Received: by 10.180.98.230 with SMTP id el6mr4341529wib.16.1429695997790; Wed, 22 Apr 2015 02:46:37 -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.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Apr 2015 02:46:37 -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 7/8] ARM: ux500: pm: Convert to multiple states Date: Wed, 22 Apr 2015 11:45:34 +0200 Message-Id: <1429695935-15815-8-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-ux500/pm_domains.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/pm_domains.c b/arch/arm/mach-ux500/pm_domains.c index 4d71c90..7b685e3 100644 --- a/arch/arm/mach-ux500/pm_domains.c +++ b/arch/arm/mach-ux500/pm_domains.c @@ -41,8 +41,12 @@ static int pd_power_on(struct generic_pm_domain *domain) static struct generic_pm_domain ux500_pm_domain_vape = { .name = "VAPE", - .power_off = pd_power_off, - .power_on = pd_power_on, + .states[0] = { + .power_off = pd_power_off, + .power_on = pd_power_on, + .name = "off", + }, + .state_count = 1, }; static struct generic_pm_domain *ux500_pm_domains[NR_DOMAINS] = {