From patchwork Wed Apr 22 09:45:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Haslam X-Patchwork-Id: 6255431 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 E2FAD9F1C4 for ; Wed, 22 Apr 2015 09:46:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1BB87202F8 for ; Wed, 22 Apr 2015 09:46:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D884202E9 for ; Wed, 22 Apr 2015 09:46:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965921AbbDVJqe (ORCPT ); Wed, 22 Apr 2015 05:46:34 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:35740 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965019AbbDVJqe (ORCPT ); Wed, 22 Apr 2015 05:46:34 -0400 Received: by wgyo15 with SMTP id o15so240682061wgy.2 for ; Wed, 22 Apr 2015 02:46:32 -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=QsheAG92w5kRo3pD8pQLDmYF4etRpuHOGgN8HDyrnBuQMCECtcZt6IyXUyvR9F0yFc KguSgzYu/yweM1hkQkdKqw3J3Iqd9T3fSYTo4pIcWWPq+oTqNdj82xgZXose08mE4XEq Uyh11KKf/9iNkVJRN42ammJ+ZlLEZK0qHjVyqo873oJTaudDD0mAPvdTTP5JNYV3kpQF seMZ6pVaefc2ruFdh3NabwopTj1j1QfIVMftCIm2bMa/tLnJST9RjsaGfz60lUw4ae8u BuJauTBrpujKxFOucBInxZi+mDqE/hphTQe/57V8WxpEM+bw7TXw8rOYsGHD+vDiQrty iRFg== X-Gm-Message-State: ALoCoQmCvtjTsoXbYgKqWBr6WA0eon37HvbgxLEAWrQ5w8MUEhFKLSVhlNlGDw0gmq64oSDh9vPe X-Received: by 10.194.104.71 with SMTP id gc7mr47306847wjb.114.1429695992489; Wed, 22 Apr 2015 02:46:32 -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.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Apr 2015 02:46:31 -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 4/8] ARM: exynos: pm: Convert to multiple states Date: Wed, 22 Apr 2015 11:45:31 +0200 Message-Id: <1429695935-15815-5-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-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))