]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
spi/pl022: Revert recent runtime PM changes
authorUlf Hansson <ulf.hansson@linaro.org>
Fri, 5 Oct 2012 15:51:11 +0000 (17:51 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 23 Oct 2012 12:27:30 +0000 (13:27 +0100)
commit213d27a42ce1646989966011d2af8563feac5635
tree11880d5278e9a3ce9c977b9ea7aeef6bcdbfde48
parent2f5f1ce90a5fa097372bb895452a718e4d33e4e3
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
drivers/spi/spi-pl022.c