From patchwork Fri Apr 24 17:35:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6272681 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 8F1B09F398 for ; Fri, 24 Apr 2015 17:36:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7FC120377 for ; Fri, 24 Apr 2015 17:36:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE47E20379 for ; Fri, 24 Apr 2015 17:35:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966681AbbDXRfy (ORCPT ); Fri, 24 Apr 2015 13:35:54 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:36764 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966672AbbDXRfy (ORCPT ); Fri, 24 Apr 2015 13:35:54 -0400 Received: by wgen6 with SMTP id n6so57897701wge.3 for ; Fri, 24 Apr 2015 10:35:53 -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=hLiIPpTORV5Ep2oDCnvjelnJIezCK8VrLz+miggCHJ4=; b=LJVROcitf/IQupZ1HFLVs8ytYtRl5erVHz8ZhEgb3yVOqVyHUtbc2LzuOEp7pZJZYI BOHhAt0+/VAmsOaztlmb8CuSUbjVXNagGb57lKA7mj/8YzeNPoba0FvAak5tYeIgx4JJ q4lBscc0wh50OSbzL9vLnhfVSyZfA6UdN4VeX/AiOdXz8cemxyMABDjEDQhc0Ru6e+nq snhvIsPECnh8Yxt98Hcy53O12OBBI60jOqTAEGOnqCHDCpVEGe35Dv/+72E7CBRmGngs jgh9vWZReDfcLXY5MrI60c+uIGaMvb3A8Hqx88mZxS8vC0XM5ppGY39DVvf+uKCqNLys p3BQ== X-Gm-Message-State: ALoCoQkoOus7kJwSsajodWhbI6HSq9jR3Qfjh0463ADB/J69vOjNABlD4BeBrd94o+tJlpg8eja9 X-Received: by 10.194.110.69 with SMTP id hy5mr18165489wjb.121.1429896952987; Fri, 24 Apr 2015 10:35:52 -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.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Apr 2015 10:35:52 -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 7/8] ARM: ux500: pm: Convert to multiple states Date: Fri, 24 Apr 2015 19:35:23 +0200 Message-Id: <1429896924-21540-8-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-ux500/pm_domains.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/mach-ux500/pm_domains.c b/arch/arm/mach-ux500/pm_domains.c index 4d71c90..c155eaa 100644 --- a/arch/arm/mach-ux500/pm_domains.c +++ b/arch/arm/mach-ux500/pm_domains.c @@ -39,10 +39,18 @@ static int pd_power_on(struct generic_pm_domain *domain) return 0; } +struct genpd_power_state ux500_genpd_states[] = { + { + .name = "OFF", + } +}; + static struct generic_pm_domain ux500_pm_domain_vape = { .name = "VAPE", .power_off = pd_power_off, .power_on = pd_power_on, + .states = ux500_genpd_states, + .state_count = ARRAY_SIZE(ux500_genpd_states), }; static struct generic_pm_domain *ux500_pm_domains[NR_DOMAINS] = {