[PATCH 2/2] Revert "spi/pl022: enable runtime PM"

[Ulf Hansson]

It seems like this patch did not get applied together with:
[PATCH 1/2] Revert "spi/pl022: fix spi-pl022 pm enable at probe"

The problem was likely my fault, since there were a lot of resends.
Anyway, it should still be possible to apply.

Kind regards
Ulf Hansson


On 5 October 2012 17:51, Ulf Hansson <ulf.hansson at stericsson.com> wrote:
> From: Ulf Hansson <ulf.hansson at linaro.org>
>
> 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 <ulf.hansson at linaro.org>
> Acked-by: Linus Walleij <linus.walleij at linaro.org>
> ---
>  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);
> --
> 1.7.10
>