Commit 213d27a4 authored Oct 05, 2012 by Ulf Hansson Committed by Mark Brown Oct 23, 2012

spi/pl022: Revert recent runtime PM changes



[Originally sent by Ulf as two changes, squashed down into one with a
redone changelog, thanks to Russell King for analysis. -- broonie]

This reverts commit 688723 (spi/pl022: enable runtime PM) and commit
2fb30d (spi/pl022: fix spi-pl022 pm enable at probe).

Commit "spi/pl022: enable runtime PM" introduced runtime PM issues as it
interacted badly with the work Russell King had done to move core
runtime PM handling into the bus.  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>

Revert "spi/pl022: enable runtime PM"

Conflicts:
	drivers/spi/spi-pl022.c

parent 2f5f1ce9

drivers/spi/spi-pl022.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2186,8 +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_resume(dev);

		pl022->clk = devm_clk_get(&adev->dev, NULL);
		if (IS_ERR(pl022->clk)) {
		status = PTR_ERR(pl022->clk);
		@@ -2292,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);

Admin message