From patchwork Fri Apr 24 17:35:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6272661 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 2287CBF4A6 for ; Fri, 24 Apr 2015 17:35:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52BC920395 for ; Fri, 24 Apr 2015 17:35:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F4E420382 for ; Fri, 24 Apr 2015 17:35:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966733AbbDXRfv (ORCPT ); Fri, 24 Apr 2015 13:35:51 -0400 Received: from mail-wi0-f173.google.com ([209.85.212.173]:34841 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966681AbbDXRfu (ORCPT ); Fri, 24 Apr 2015 13:35:50 -0400 Received: by widdi4 with SMTP id di4so30383268wid.0 for ; Fri, 24 Apr 2015 10:35:49 -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=XuXlfwQ8jN1qPrYa96DCC2rmytljvVz7DGJ1d5+VldY=; b=FWGLWmesqEykDWKzs9r7wvkIBiPn6FGH70tDArnJD3dvNr1bZQHWBjq1EoN5gE1Z83 iYPrPVqPt6jWNL5DIKbVGdU/cnq0DUe8g8/MCBbZHczntecSw/cHXj+i+Db4K6AbMOLD Sxlzd7uvRqUMhH4NBIS7XDWEpwFucI1qr/ZCn0l37jsw/DcVEnuiR2WKWf0o6FAbwTZu ty+KL5stae6vgr1RCY+xWSe6pI+KQKCXdC4yKOe0QcmY2zxIZ/Mjv9T6Ia6Gw8n1T3wm M9Ur4sxhqCQ5BmUXNMlhHKSrCh6E+aqMIrnsX9yvKqqPOCnK6R+eIBQCJF6216FUW+g7 xSMw== X-Gm-Message-State: ALoCoQkrGTnBnNCvDddTVon55lU85fFVCfUKNv8Jd9+BsrBjVs/IZKEOAHWoZWx9Ei/JZ8v44b+t X-Received: by 10.180.99.231 with SMTP id et7mr5817405wib.23.1429896949396; Fri, 24 Apr 2015 10:35:49 -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.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Apr 2015 10:35:48 -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 5/8] ARM: r8a7779: pm: Convert to multiple states Date: Fri, 24 Apr 2015 19:35:21 +0200 Message-Id: <1429896924-21540-6-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-shmobile/pm-r8a7779.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c index 44a74c4..2ecca87 100644 --- a/arch/arm/mach-shmobile/pm-r8a7779.c +++ b/arch/arm/mach-shmobile/pm-r8a7779.c @@ -79,6 +79,12 @@ static bool pd_active_wakeup(struct device *dev) return true; } +struct genpd_power_state r8a7779_genpd_states[] = { + { + .name = "OFF", + } +}; + static void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd) { struct generic_pm_domain *genpd = &r8a7779_pd->genpd; @@ -88,6 +94,8 @@ static void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd) genpd->dev_ops.active_wakeup = pd_active_wakeup; genpd->power_off = pd_power_down; genpd->power_on = pd_power_up; + genpd->states = r8a7779_genpd_states; + genpd->state_count = ARRAY_SIZE(r8a7779_genpd_states); if (pd_is_off(&r8a7779_pd->genpd)) pd_power_up(&r8a7779_pd->genpd);