From patchwork Thu Oct 4 08:04:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11975 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 2BAA024157 for ; Thu, 4 Oct 2012 08:06:06 +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 7F996A180A7 for ; Thu, 4 Oct 2012 08:06:05 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so386131iej.11 for ; Thu, 04 Oct 2012 01:06:05 -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=de7q9xJuRZOUP7oh6gk+/aTnZiKzGWSVOrWS6BQw+58=; b=krdbkVLwxmPzIZ8owsktAlNDOu5HgT9HCv2++MnI0s1fzhekqV9QZ9+lW+tJrqbGrt Onxk+TB0uFERrN4a2vrKB74KDisKVm3Jr5rfCPCmaOEM1n0QIBo2BcEDG7JrzKS7Az7J u4lVWlIcBtHyAT2rb1DKxj9RvKKD4SyVXEhMI8g292jUkmu4FWeBiztOW/ZCkh2DD0Eu +DXzqNuMx0G3ZptWH6U2HODk/g5uoR3GNFC5cOsumzHx+Y3B+PRZ94Y9rxJ0SeyeXmuE 7RmTYXpgqLwcSOIEJGBAyoD2yScURXcF/1T7ggXqVrNcV+s6Wh2gThw1nOKqHWzmKO6W Wraw== Received: by 10.50.154.137 with SMTP id vo9mr13991344igb.28.1349337964945; Thu, 04 Oct 2012 01:06:04 -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 ex8csp54105igc; Thu, 4 Oct 2012 01:06:04 -0700 (PDT) Received: by 10.14.173.9 with SMTP id u9mr6215313eel.8.1349337963557; Thu, 04 Oct 2012 01:06:03 -0700 (PDT) Received: from eu1sys200aog118.obsmtp.com (eu1sys200aog118.obsmtp.com [207.126.144.145]) by mx.google.com with SMTP id v4si2892423eel.80.2012.10.04.01.05.52 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 01:06:03 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.145 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.145; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.145 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-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob118.postini.com ([207.126.147.11]) with SMTP ID DSNKUG1DXtWjzUFLOjmfpv1dzMcgtrStPojU@postini.com; Thu, 04 Oct 2012 08:06:03 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 ACACB40; Thu, 4 Oct 2012 08:04:20 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 7A5946F; Thu, 4 Oct 2012 03:48:28 +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 B028AA8065; Thu, 4 Oct 2012 10:04:47 +0200 (CEST) Received: from steludxu1397.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; Thu, 4 Oct 2012 10:04:50 +0200 From: Ulf Hansson To: Mark Brown , Grant Likely , Cc: , Linus Walleij , Vipul Kumar Samar , Viresh Kumar , Russell King , Ulf Hansson Subject: [PATCH V2 2/3] Revert "spi/pl022: enable runtime PM" Date: Thu, 4 Oct 2012 10:04:40 +0200 Message-ID: <1349337881-15917-3-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1349337881-15917-1-git-send-email-ulf.hansson@stericsson.com> References: <1349337881-15917-1-git-send-email-ulf.hansson@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkWqIN1zT48KN3y0lyYEWNT+pZx6yuAiRN5ZhiaBcOY+vQgQDyr6y9kwt44/tiaJkPSho79 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 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);