From patchwork Wed Feb 26 13:44:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 25353 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9B7DA20715 for ; Wed, 26 Feb 2014 13:47:20 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id lf12sf2152847vcb.9 for ; Wed, 26 Feb 2014 05:47:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=Z5+0XkPhF7GbJmRkqedcu0+A6q+pkiLawyAXvDe2/j0=; b=IaTn9ZzOXk4dtm3E0QJpsA9oqddjaHM3EDZDV4KKgAmQWvsJskNaT08Dd43EL8e9uR DnGCuUPRPYVJ21jPG7ftclNcOTjrWsdm2vV9t3NQayuOpxCwrKwCpHaZPGW+AmLYnq+5 wW17wuous4GWu9YN7BlUqOFT6FS8ZvRRXsvYheul3DF5aSKgub9liLbu+KJgJtJAJef+ BxjZw8irQqppuAwM0mdjo0GsJXB/9KIzsemPNIEe24ndJ4LMy7PtA9keRZ6h1Lh6JWaE hMg0oQC1OXE4M64x27KmEB+xsSdZ9nrzREzw3/mTWgmxzF2L4OtWB0UnMysSdeuK6nVV UqOw== X-Gm-Message-State: ALoCoQmWIyIO7ZhLrS5ptgpQeBoIpmkqkctCOXVlhC/qjOvSHvfvW+60UcQDXyQGDnDpUrs4odmm X-Received: by 10.58.136.100 with SMTP id pz4mr3402071veb.26.1393422440375; Wed, 26 Feb 2014 05:47:20 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.226 with SMTP id 89ls220848qgr.14.gmail; Wed, 26 Feb 2014 05:47:20 -0800 (PST) X-Received: by 10.52.242.167 with SMTP id wr7mr5166278vdc.32.1393422440243; Wed, 26 Feb 2014 05:47:20 -0800 (PST) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id si3si229138vcb.28.2014.02.26.05.47.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Feb 2014 05:47:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jy13so2128147veb.23 for ; Wed, 26 Feb 2014 05:47:20 -0800 (PST) X-Received: by 10.221.30.14 with SMTP id sa14mr89331vcb.44.1393422440168; Wed, 26 Feb 2014 05:47:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp26745vcz; Wed, 26 Feb 2014 05:47:19 -0800 (PST) X-Received: by 10.194.87.5 with SMTP id t5mr1574948wjz.68.1393422438698; Wed, 26 Feb 2014 05:47:18 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id hh7si10389997wib.65.2014.02.26.05.47.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Feb 2014 05:47:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIenn-0002wh-A9; Wed, 26 Feb 2014 13:45:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIenR-0007PU-Pv; Wed, 26 Feb 2014 13:45:13 +0000 Received: from am1ehsobe002.messaging.microsoft.com ([213.199.154.205] helo=am1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIemy-0007Kp-6a for linux-arm-kernel@lists.infradead.org; Wed, 26 Feb 2014 13:44:45 +0000 Received: from mail81-am1-R.bigfish.com (10.3.201.233) by AM1EHSOBE017.bigfish.com (10.3.207.139) with Microsoft SMTP Server id 14.1.225.22; Wed, 26 Feb 2014 13:44:22 +0000 Received: from mail81-am1 (localhost [127.0.0.1]) by mail81-am1-R.bigfish.com (Postfix) with ESMTP id 7576D32041E; Wed, 26 Feb 2014 13:44:22 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275dh1de097hz2dh87h2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail81-am1 (localhost.localdomain [127.0.0.1]) by mail81-am1 (MessageSwitch) id 1393422260454074_28056; Wed, 26 Feb 2014 13:44:20 +0000 (UTC) Received: from AM1EHSMHS018.bigfish.com (unknown [10.3.201.228]) by mail81-am1.bigfish.com (Postfix) with ESMTP id 6B6CE2E0060; Wed, 26 Feb 2014 13:44:20 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS018.bigfish.com (10.3.207.156) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 26 Feb 2014 13:44:20 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.3.158.2; Wed, 26 Feb 2014 13:44:12 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.98]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s1QDi3TR008570; Wed, 26 Feb 2014 06:44:08 -0700 From: Shawn Guo To: Subject: [PATCH 3/4] ARM: imx6: call suspend_set_ops() from suspend routine Date: Wed, 26 Feb 2014 21:44:39 +0800 Message-ID: <1393422280-22283-3-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> References: <1393422280-22283-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140226_084444_548410_12D7F298 X-CRM114-Status: GOOD ( 10.13 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [213.199.154.205 listed in list.dnswl.org] 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Shawn Guo , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Rename function imx6q_ocram_suspend_init() to imx6q_suspend_init() and call suspend_set_ops() from there. Now we get a centralized function for suspend initialization. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/pm-imx6q.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c index a9a187d..2473ad4 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6q.c @@ -382,8 +382,7 @@ out: return ret; } -static int __init imx6q_ocram_suspend_init(const struct imx6_pm_socdata - *socdata) +static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) { phys_addr_t ocram_pbase; struct device_node *node; @@ -394,6 +393,8 @@ static int __init imx6q_ocram_suspend_init(const struct imx6_pm_socdata int i, ret = 0; const u32 *mmdc_offset_array; + suspend_set_ops(&imx6q_pm_ops); + if (!socdata) { pr_warn("%s: invalid argument!\n", __func__); return -EINVAL; @@ -515,9 +516,9 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata WARN_ON(!ccm_base); - ret = imx6q_ocram_suspend_init(socdata); + ret = imx6q_suspend_init(socdata); if (ret) - pr_warn("%s: failed to initialize ocram suspend %d!\n", + pr_warn("%s: No DDR LPM support with suspend %d!\n", __func__, ret); /* @@ -531,9 +532,6 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata if (!IS_ERR(gpr)) regmap_update_bits(gpr, IOMUXC_GPR1, IMX6Q_GPR1_GINT, IMX6Q_GPR1_GINT); - - - suspend_set_ops(&imx6q_pm_ops); } void __init imx6q_pm_init(void)