From patchwork Wed Apr 22 09:45:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6255451 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 610CEBF4A6 for ; Wed, 22 Apr 2015 09:46:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AB872035D for ; Wed, 22 Apr 2015 09:46:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4EF2202FF for ; Wed, 22 Apr 2015 09:46:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965923AbbDVJqi (ORCPT ); Wed, 22 Apr 2015 05:46:38 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:36586 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965019AbbDVJqh (ORCPT ); Wed, 22 Apr 2015 05:46:37 -0400 Received: by wizk4 with SMTP id k4so170772641wiz.1 for ; Wed, 22 Apr 2015 02:46:36 -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=vAJGM8pFqEcXxUZVyhIiGXn/wmA1RCEtHbtPEW7MemI=; b=dFypLXkQO0mfPiBaLJy0Qb3K63NzTlOqujZRlg/Nl9aYPylMvIbol+wi1Vr2igKd7H DXLJ7VjR9PGnsmKZ0KMzqC0YUBAl+5TxquOHCuR2L5aoVwuSQND3lyBz1r1PgbhqdCpn CqxnV0tjj7WB6tQRBnJOIIQb6lYJJyvKvxISCatmGP76OLycyNYQICF7rPfyLW4AXy+q Lelcq9lIg2onUGdSEr4BGkGvGOBGia05qM+5TrYTzS1xy+O8+cXEEwnnGiVCs2xGiGgZ XHp/BTfSjVSqlPNH6A43h7hFCTs2HQlBZ9yDHU+x6CEuoRpIWwRstJD1N8kmclz1r5ya QSVg== X-Gm-Message-State: ALoCoQmmwMjO3VpqM3f6jYCHSO6wL2kFAHtOi4LokhVoQu0JQIkfO8KL/ph3coHauuZfIFHQuqXf X-Received: by 10.194.52.10 with SMTP id p10mr47816233wjo.98.1429695996140; Wed, 22 Apr 2015 02:46:36 -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.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Apr 2015 02:46:35 -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 6/8] ARM: rmobile: pm: Convert to multiple states Date: Wed, 22 Apr 2015 11:45:33 +0200 Message-Id: <1429695935-15815-7-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-shmobile/pm-rmobile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c index 9501820..8badaae 100644 --- a/arch/arm/mach-shmobile/pm-rmobile.c +++ b/arch/arm/mach-shmobile/pm-rmobile.c @@ -156,8 +156,10 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) genpd->flags = GENPD_FLAG_PM_CLK; pm_genpd_init(genpd, gov ? : &simple_qos_governor, false); 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[0].power_off = rmobile_pd_power_down; + genpd->states[0].power_on = rmobile_pd_power_up; + genpd->states[0].name = "off"; + genpd->state_count = 1; genpd->attach_dev = rmobile_pd_attach_dev; genpd->detach_dev = rmobile_pd_detach_dev; __rmobile_pd_power_up(rmobile_pd, false);