From patchwork Tue Oct 23 12:08:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12439 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 7393723EF8 for ; Tue, 23 Oct 2012 12:09:54 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 13EF4A18B46 for ; Tue, 23 Oct 2012 12:09:53 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so2799032iag.11 for ; Tue, 23 Oct 2012 05:09: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:mime-version:content-type :x-gm-message-state; bh=B3GN+jFVBZjB8sDpx8z3r1351LCCqbZuel82/Bki0io=; b=maHEWnxfImIXNp0gcBy3QMQE0RHQd+yuLZhQXCC8j6Fpd9jVdGtPCAWHVcdIrdPXC/ BFJcHqg1rZqlxKBIMJT6eZsnHvaCqhvMT6tDm8AbfWCWCavEbve4c99eBPA5DcMScw1H rx6/Ycfa88kAcMfKQ8rxBYr9aq8FDKMk09iEjiaL3Qg1QYMgRyENpl5RS9kdg2hoYhk3 d825HbX7FaR70CKfumNacgTtZzL+4bsNPfWtRdn9wnMmyzlUReV5RvgqjY1+ZRamD2JC jIg0PeKsHDVI3+qhkx6bh1vi6/dS6/dPUB6mIS1FoCKQqqBuWpWIGxk41hUUZ6+qJrDM wnTg== Received: by 10.50.194.169 with SMTP id hx9mr12444134igc.70.1350994193488; Tue, 23 Oct 2012 05:09: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.67.148 with SMTP id n20csp415084igt; Tue, 23 Oct 2012 05:09:52 -0700 (PDT) Received: by 10.14.200.134 with SMTP id z6mr16373231een.33.1350994191880; Tue, 23 Oct 2012 05:09:51 -0700 (PDT) Received: from eu1sys200aog115.obsmtp.com (eu1sys200aog115.obsmtp.com [207.126.144.139]) by mx.google.com with SMTP id l45si5800231eep.51.2012.10.23.05.09.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Oct 2012 05:09: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-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob115.postini.com ([207.126.147.11]) with SMTP ID DSNKUIaI/zOAEYjRNSlpUfRMgWNXkK/2Q5HV@postini.com; Tue, 23 Oct 2012 12:09:51 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 413CC139; Tue, 23 Oct 2012 12:08:58 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 4496A2AC4; Tue, 23 Oct 2012 12:08:58 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id CCD70A8074; Tue, 23 Oct 2012 14:08:52 +0200 (CEST) Received: from steludxu1397.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 23 Oct 2012 14:08:57 +0200 From: Ulf Hansson To: Mark Brown , Grant Likely , Cc: , Linus Walleij , Vipul Kumar Samar , Viresh Kumar , Russell King , Ulf Hansson Subject: [PATCH] Revert "spi/pl022: enable runtime PM" Date: Tue, 23 Oct 2012 14:08:36 +0200 Message-ID: <1350994116-9127-1-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkIryKr6uOAhlLJyA8NFKyGz474NUqVf5puImZsrETURnO6oM84Ub6ydkHLwzFZ+xnANLFe 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 --- This patch is based on linux next as of 2012-10-23. Latest patch for spi-pl022 driver was this one: spi/pl022: add IDLE state pin management --- 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 0205d47..1361868 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2192,9 +2192,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); @@ -2298,7 +2295,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);