From patchwork Mon Apr 20 15:02:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6242731 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 1517EBF4A7 for ; Mon, 20 Apr 2015 15:02:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 40C4A2047D for ; Mon, 20 Apr 2015 15:02:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F07A20458 for ; Mon, 20 Apr 2015 15:02:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753194AbbDTPCW (ORCPT ); Mon, 20 Apr 2015 11:02:22 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:35198 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753179AbbDTPCW (ORCPT ); Mon, 20 Apr 2015 11:02:22 -0400 Received: by wgyo15 with SMTP id o15so182479285wgy.2 for ; Mon, 20 Apr 2015 08:02:21 -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=hj6A/yaOjUHdJCJiH+dq6XSGNBU0UtagnrbcDgxj0I4=; b=Px9HWbRzCDtUQ4mgNdnuCxa3clRmNx8LOGUQ3YEpOL0bU5MvSUggjVTut5oJCKvfNI TUDhQ9na/l6MQg8kojz+zAdQ8Oe7XkmKjk1swg5f/vpwDKIzdwEXLcbtc6+eh/SBzV2A 5u4N+Jn07EsUqmpQyTeT3hy7QxQ8r4LbZW/LFovMSB4WltCz6avRW4U8muuUyQKtLlo0 5WGxj9PplQZjphnvOFNjdYG5lMabAKYugzJj2IT5h7GCUMLmISzeP3W5EEEsYsDT1vWt JbSLtYSJ8a1XoDWHPx7OKOpQdSPhZPS3ev0ckaPWuvU/jnXmKH0nYiPSQ1a7PoO+SVWn DaAg== X-Gm-Message-State: ALoCoQmgZY6JSJkZFMBmCN4AMyUb7d9FzUtyHbPXFNQn4AWHTIW4WE9JfWS5XB2SbZ45de3OKk8C X-Received: by 10.194.77.44 with SMTP id p12mr32364837wjw.1.1429542141056; Mon, 20 Apr 2015 08:02:21 -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.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Apr 2015 08:02:20 -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 4/7] ARM: exynos: pm: Convert to multiple states Date: Mon, 20 Apr 2015 17:02:05 +0200 Message-Id: <1429542128-21021-5-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-exynos/pm_domains.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 37266a8..01fc620 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -128,8 +128,10 @@ static __init int exynos4_pm_init_power_domain(void) pd->pd.name = kstrdup(np->name, GFP_KERNEL); pd->name = pd->pd.name; pd->base = of_iomap(np, 0); - pd->pd.power_off = exynos_pd_power_off; - pd->pd.power_on = exynos_pd_power_on; + pd->pd.states[0].power_off = exynos_pd_power_off; + pd->pd.states[0].power_on = exynos_pd_power_on; + pd->pd.states[0].name = "off"; + pd->pd.state_count = 1; pd->oscclk = clk_get(dev, "oscclk"); if (IS_ERR(pd->oscclk))