From patchwork Wed Oct 17 12:26:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12310 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 619621D5170 for ; Wed, 17 Oct 2012 12:27:16 +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 165B4A183CE for ; Wed, 17 Oct 2012 12:27:15 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11246023iej.11 for ; Wed, 17 Oct 2012 05:27:15 -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=3WE9iI4J6QiPoa9LfX548Az0tvaa5+npsUS14rq6Ras=; b=Dn6+9RwycAxhtXEP0tZw+DqtHZqdhfMYv0BS6WLlJcV9pVWrUDkMCR6KbY2X7Cf1xM /kG9gDwIjoDCjjDvGm4kxjwafl9ywGAvYiI15KdNghtof+urteQnF279g7TCNWEGY3TF 7Oc0C049CBsg9m4uX4PMc5CCDUtkgpxIVNsVpFm5JLVFrIplq6KYJ4M/cJd3DdROY0pb 2gFfY9aIzqZHwybmTpv57HYx77SLTJRkRsvkjqYOo0MEflWqA5M0DYhctGtPoWmItC8+ 0nqsj9OuKTTSrVV10iNVnPioi46qwD7nMiuRq5fvRhNarzSI6Irr9nnU+vgKWT6kDDQ3 l6DA== Received: by 10.50.236.72 with SMTP id us8mr1288456igc.70.1350476835757; Wed, 17 Oct 2012 05:27:15 -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 n20csp886773igt; Wed, 17 Oct 2012 05:27:14 -0700 (PDT) Received: by 10.14.200.134 with SMTP id z6mr26446299een.33.1350476834089; Wed, 17 Oct 2012 05:27:14 -0700 (PDT) Received: from eu1sys200aog117.obsmtp.com (eu1sys200aog117.obsmtp.com [207.126.144.143]) by mx.google.com with SMTP id z46si16453769eeo.88.2012.10.17.05.27.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 05:27:14 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.143 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.143; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.143 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob117.postini.com ([207.126.147.11]) with SMTP ID DSNKUH6kGJq+Lzyd66t4UJz7t7G1dg89opq4@postini.com; Wed, 17 Oct 2012 12:27:13 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 657A447; Wed, 17 Oct 2012 12:26:31 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 9AF8965; Wed, 17 Oct 2012 08:00: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 relay2.stm.gmessaging.net (Postfix) with ESMTPS id 5CB42A8074; Wed, 17 Oct 2012 14:26:57 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 17 Oct 2012 14:27:02 +0200 From: Linus Walleij To: Grant Likely , Mark Brown , Cc: Anmar Oueja , Ulf Hansson , Linus Walleij Subject: [PATCH 1/4] Revert "spi/pl022: enable runtime PM" Date: Wed, 17 Oct 2012 14:26:58 +0200 Message-ID: <1350476818-13056-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQllcqzK1xX4jURBqJZTNQcDGJJZZZlqPX6sWi3xa1KZOpoxXFioqCySsHtAtgN0aOE7z5Cy From: Ulf Hansson This reverts commit 2fb30d1147c599f5657e8c62c862f9a0f58d9d99. This patch is reverted due to wrong runtime PM code. Conflicts: drivers/spi/spi-pl022.c Signed-off-by: Ulf Hansson Signed-off-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);