From patchwork Fri Oct 5 15:51:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12031 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 378C923E57 for ; Fri, 5 Oct 2012 15:51:55 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4551FA190F8 for ; Fri, 5 Oct 2012 15:51:54 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4052318iej.11 for ; Fri, 05 Oct 2012 08:51:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:x-gm-message-state; bh=c7LSuCatb86xKxYv+Ak7G0FQ4xLkhyWFGD6IRBsmfNk=; b=kl5XHFl2kwm5uIS/WnuIyi8sbtvNcfDYOgrSczMkclnQCDPFasPXgZMv/F58PKFCU3 9XSWWHPpt2u1NVj1N/JXXJ8cg30d20avK26PD/DgtwGiqfTkZVrn5TZbvDXRShXHVoEM KJG+SfEV1tKW6ZBEK9HY2WRxf5lam/NZ5+i3X5sesdOlNKIH0jv2NhmlLXnETEs9/+D3 h+BRK/653pnCD/y9sh62cyuL8ydBeDXBqA/3mfAUA8rnjTf+4+ywvrORsuFFGC3crp6X UBJz7lYBERYWywPNhO0ZsAe6vjAid5VCX3uc6WFqDnSf4pP4CO6RvCudtU3+7BIcwrE7 DDwQ== Received: by 10.50.178.40 with SMTP id cv8mr1627919igc.0.1349452313691; Fri, 05 Oct 2012 08:51:53 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp133493igc; Fri, 5 Oct 2012 08:51:52 -0700 (PDT) Received: by 10.14.179.136 with SMTP id h8mr13757382eem.6.1349452311412; Fri, 05 Oct 2012 08:51:51 -0700 (PDT) Received: from eu1sys200aog115.obsmtp.com (eu1sys200aog115.obsmtp.com [207.126.144.139]) by mx.google.com with SMTP id j47si2321679eep.98.2012.10.05.08.51.36 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 08:51:51 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.139; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.139 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) smtp.mail=ulf.hansson@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKUG8CBrEWCJZhm985ygDwBLVfTNORa9yN@postini.com; Fri, 05 Oct 2012 15:51:50 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 529689C; Fri, 5 Oct 2012 15:43:13 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 7E4182F9; Fri, 5 Oct 2012 15:51:26 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 72AF924C2AB; Fri, 5 Oct 2012 17:51:17 +0200 (CEST) Received: from steludxu1397.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 5 Oct 2012 17:51:24 +0200 From: Ulf Hansson To: Mark Brown , Grant Likely , Cc: , Linus Walleij , Vipul Kumar Samar , Viresh Kumar , Russell King , Ulf Hansson Subject: [PATCH 2/2] Revert "spi/pl022: enable runtime PM" Date: Fri, 5 Oct 2012 17:51:12 +0200 Message-ID: <1349452272-4002-2-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349452272-4002-1-git-send-email-ulf.hansson@stericsson.com> References: <1349452272-4002-1-git-send-email-ulf.hansson@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnoFg8G8uURfdeMwqeQ0+2vAXiGcbGMO4UBYMYmjTvYE+JBOcgdAOxT2oGTPvZDzDcHWM5I From: Ulf Hansson This reverts commit 2fb30d1147c599f5657e8c62c862f9a0f58d9d99. This patch introduced runtime PM issues and is not needed at all. Thus we should revert it. Conflicts: drivers/spi/spi-pl022.c Signed-off-by: Ulf Hansson Acked-by: Linus Walleij --- drivers/spi/spi-pl022.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 5cf0643..a1db91a 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2186,9 +2186,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", adev->res.start, pl022->virtbase); - pm_runtime_enable(dev); - pm_runtime_resume(dev); - pl022->clk = devm_clk_get(&adev->dev, NULL); if (IS_ERR(pl022->clk)) { status = PTR_ERR(pl022->clk); @@ -2293,7 +2290,6 @@ pl022_remove(struct amba_device *adev) clk_disable(pl022->clk); clk_unprepare(pl022->clk); - pm_runtime_disable(&adev->dev); amba_release_regions(adev); tasklet_disable(&pl022->pump_transfers); spi_unregister_master(pl022->master);