Revert "spi/pl022: enable runtime PM"

PATCH New Ulf Hansson 2 participants 2 messages Oct 23, 2012

Subsystems (2)

SPI Arm primecell ssp PL022 SPI driver

lore

Share & tools

lore

Ulf Hansson

author

2012-10-23 12:08 UTC #0 lore raw

PATCH 1/1 Revert "spi/pl022: enable runtime PM"

From: Ulf Hansson <[email protected]>

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 <[email protected]>

Acked-by Linus Walleij <[email protected]>

---

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(-)

drivers/spi/spi-pl022.c +0 -4

index 0205d47..1361868 100644
@@ -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);

Signature · 1 line

1.7.10

Mark Brown

2012-10-23 13:08 UTC #1 lore raw

PATCH 1/1 Revert "spi/pl022: enable runtime PM"

Quoted 6 lines · Ulf Hansson

From: Ulf Hansson <[email protected]>
This reverts commit 2fb30d1147c599f5657e8c62c862f9a0f58d9d99.
This patch introduced runtime PM issues and is not needed at all. Thus we should revert it.

As covered elsewhere I applied a revert myself.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121023/41af29aa/attachment.sig>