From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Fri, 5 Oct 2012 15:51:11 +0000 (+0200)
Subject: spi/pl022: Revert "spi/pl022: fix spi-pl022 pm enable at probe"
X-Git-Tag: next-20121018~27^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5015a2e1679f9f56b574f3aab7006517106da83c;p=karo-tx-linux.git

spi/pl022: Revert "spi/pl022: fix spi-pl022 pm enable at probe"

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 <ulf.hansson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 919464102d33..5cf0643ae74c 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);