From patchwork Mon Apr 20 15:02:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6242761 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 1995D9F313 for ; Mon, 20 Apr 2015 15:02:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 60C6A20453 for ; Mon, 20 Apr 2015 15:02:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8515A20458 for ; Mon, 20 Apr 2015 15:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753538AbbDTPC1 (ORCPT ); Mon, 20 Apr 2015 11:02:27 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:33981 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751223AbbDTPC1 (ORCPT ); Mon, 20 Apr 2015 11:02:27 -0400 Received: by wgso17 with SMTP id o17so182616225wgs.1 for ; Mon, 20 Apr 2015 08:02:26 -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=NIyOLKqcZ/u6UFl/7cCVubOvQHrehQ+B6eKkOiOimVGR/4+RumrK13H4aKid115M+q qlZscd7oGkQcVb1c8qzPqbhvRyiMTC3hDtm2Uvm9ztNtViNshWYEP8n7bynKNOxVgY9e 1WnM7DRklNPoe9e8SKiE610SAv5QKkdg2cs4IX76rCtY77EH5C5qbbL97Y0cYqZ8yjtA 5GH8J/KiNUYeWjzjD0QKXOcdAurhxLN+M+yBWtyy/47IyiLEObt0dIoxYYHyXupayTPJ z40kPrrstQ1oQkuS8LQeBmKX1D3cG4H5EsvpLEJA2BnwkZ3I2jSUQO53Os1h8EiJeqtq yZ6Q== X-Gm-Message-State: ALoCoQn5+HOYPbVPFtbXxgbZ7JGdV8j6aRXbUPPAjChczRO20dpBMd3PLZRp7aG1kXC+p9aZTdPt X-Received: by 10.194.185.68 with SMTP id fa4mr31091255wjc.111.1429542146039; Mon, 20 Apr 2015 08:02:26 -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.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Apr 2015 08:02:25 -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: [RFC v3 7/7] ARM: ux500: pm: Convert to multiple states Date: Mon, 20 Apr 2015 17:02:08 +0200 Message-Id: <1429542128-21021-8-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-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] = {