From patchwork Fri Oct 5 15:51:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12030 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 CD5EB23E57 for ; Fri, 5 Oct 2012 15:51:53 +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 5D90CA190F4 for ; Fri, 5 Oct 2012 15:51:53 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4052289iej.11 for ; Fri, 05 Oct 2012 08:51:52 -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=V4AHRYIpEzgEoJIQw/mxYHQq30/nMDNxhz8VSgN0ZsM=; b=Qy3aFnxJsd3ApZcZU6BL/mH+QzPzm3l+mtwwqmrvz6ZupI3cASJwsD1RyyGxMhTtYt mSS/7atQpxFmJ2ZWMIruZmbj2mVkahKGaN+16wtpXB5dQFmdFH3Xz+IEXbIg6XuuRcs3 2ayguJHx4plheWQzpECHcg9zHCes6xC1nZGRxcFaQMTZsSSCbBA/DVDKxUyzP2CtXlqs cUMsTQ/qKSlVXAiD6UFMQ0nLNpY/ChlP2R6c3keIlR6vn5rj/JkkjA1RvFhNdQ1KvgzS R/OfQodQYs1LsKaMHin9wmhcmeVTfmGEw3eGemRzPx8uuURHZTHECKuyl516fIDd4MFN Fp7A== Received: by 10.50.150.198 with SMTP id uk6mr1558458igb.43.1349452312776; Fri, 05 Oct 2012 08:51:52 -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 ex8csp133491igc; Fri, 5 Oct 2012 08:51:51 -0700 (PDT) Received: by 10.14.218.5 with SMTP id j5mr13895543eep.41.1349452310538; Fri, 05 Oct 2012 08:51:50 -0700 (PDT) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com [207.126.144.129]) by mx.google.com with SMTP id g9si2194819eep.12.2012.10.05.08.51.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 08:51:50 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.129; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.129 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 eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUG8CA1SwVVh9LGi86wNe1EbA9ylP36P2@postini.com; Fri, 05 Oct 2012 15:51:50 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 9A92A47; Fri, 5 Oct 2012 15:50:51 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 51A575C; Fri, 5 Oct 2012 11:33:57 +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 6906224C2AB; Fri, 5 Oct 2012 17:51:13 +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:20 +0200 From: Ulf Hansson To: Mark Brown , Grant Likely , Cc: , Linus Walleij , Vipul Kumar Samar , Viresh Kumar , Russell King , Ulf Hansson Subject: [PATCH 1/2] Revert "spi/pl022: fix spi-pl022 pm enable at probe" Date: Fri, 5 Oct 2012 17:51:11 +0200 Message-ID: <1349452272-4002-1-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQl46a4fhwu+LjMoSETLhJVI540ZMeALVuTzloKUQ03LTR+BJUcSwVgRPmhWkMH+1XLcIk/k From: Ulf Hansson This reverts commit 6887237cd7da904184dab2750504040c68f3a080. Commit "spi/pl022: enable runtime PM" introduced runtime PM issues. Due to that commit, "spi/pl022: fix spi-pl022 pm enable at probe" was merged to fix part of those issues. Instead of adding another fix, let's clean up and revert everything back to when it was already fine. Signed-off-by: Ulf Hansson Reviewed-by: Linus Walleij --- drivers/spi/spi-pl022.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 9194641..5cf0643 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2186,6 +2186,7 @@ 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);