From patchwork Wed Apr 22 09:45:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6255441 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 7ADFCBF4A6 for ; Wed, 22 Apr 2015 09:46:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A676A2035D for ; Wed, 22 Apr 2015 09:46:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B02E820306 for ; Wed, 22 Apr 2015 09:46:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965922AbbDVJqg (ORCPT ); Wed, 22 Apr 2015 05:46:36 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:36487 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965019AbbDVJqf (ORCPT ); Wed, 22 Apr 2015 05:46:35 -0400 Received: by wgen6 with SMTP id n6so25749666wge.3 for ; Wed, 22 Apr 2015 02:46:34 -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=Xbdvk5ifoxZNizrJaz08zuezQISQ0v8yKd7P626K3tA=; b=LQMWrfUBIFI4urppMzk22kmFAxKqP0a8YXuo5RoaJIk0Czc3CZnSiVNdSRwSSWTYk1 VwoxSnbzD4oGlNS2K6zpUAW0CZM+nRsU4/KQoTWEnJkWUvsC6svmtjv3yAjcy68WvUz3 X+TNygQdGxnLwpp2jI92dk7hx51twt8CACyepagbfKJGjEUJ2J4mj8yRTotct44H0iU4 cDFyb/5XjyPQIBzV9JiBSfgo+SLKJRXpVLKl9QXX/5lt9unMH5+QBtsGezBuDmYr47/7 f/MMs/TblwdH2KwpR4UOgK0XwAR8E8oewfuvfGfqxS4jajhoElERLQ3CY9utD9Jrxt2s VCDw== X-Gm-Message-State: ALoCoQnmWDvohz34SZl7WcQVdOrNWca2qgQ4HAZKukVn8ZUrzIrda9IxW9ZG8JpHX6tMTtqhK4Xc X-Received: by 10.194.23.66 with SMTP id k2mr10655993wjf.18.1429695994433; Wed, 22 Apr 2015 02:46:34 -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.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Apr 2015 02:46:33 -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 5/8] ARM: r8a7779: pm: Convert to multiple states Date: Wed, 22 Apr 2015 11:45:32 +0200 Message-Id: <1429695935-15815-6-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-r8a7779.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c index 44a74c4..2f1d1e8 100644 --- a/arch/arm/mach-shmobile/pm-r8a7779.c +++ b/arch/arm/mach-shmobile/pm-r8a7779.c @@ -86,8 +86,10 @@ static void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd) genpd->flags = GENPD_FLAG_PM_CLK; pm_genpd_init(genpd, NULL, false); genpd->dev_ops.active_wakeup = pd_active_wakeup; - genpd->power_off = pd_power_down; - genpd->power_on = pd_power_up; + genpd->states[0].power_off = pd_power_down; + genpd->states[0].power_on = pd_power_up; + genpd->states[0].name = "off"; + genpd->state_count = 1; if (pd_is_off(&r8a7779_pd->genpd)) pd_power_up(&r8a7779_pd->genpd);