summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2011-10-17 12:45:38 +0200
committerLinus WALLEIJ <linus.walleij@stericsson.com>2011-10-17 15:15:45 +0200
commitf56b4e2c066a5ae02c0ae3f2f5f2ed86dc39f7cd (patch)
tree9d8312ea8b5feb4de0834f3ac0ac51ee1e04c510
parent1523a22db0866b9a93126970616d9de76c7b4621 (diff)
Revert "amba-pl022: Clear SSE once the transfer is completed"
This reverts commit 015a0108f545d8ccd0b961bfcf56a3a1bcdd502d. Change-Id: Ibd21c4e21dd919395874ab13d16f9074105fff1a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34203 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com>
-rw-r--r--drivers/spi/amba-pl022.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index af36e201d66..0288654571a 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -516,12 +516,7 @@ static void giveback(struct pl022 *pl022)
msg->state = NULL;
if (msg->complete)
msg->complete(msg->context);
-
- /* disable the SPI/SSP operation */
- writew((readw(SSP_CR1(pl022->virtbase)) &
- (~SSP_CR1_MASK_SSE)), SSP_CR1(pl022->virtbase));
-
- /* This message is completed, so let's turn off the clock! */
+ /* This message is completed, so let's turn off the clocks & power */
clk_disable(pl022->clk);
amba_pclk_disable(pl022->adev);
amba_vcore_disable(pl022->adev);
@@ -2233,6 +2228,11 @@ static int pl022_suspend(struct amba_device *adev, pm_message_t state)
return status;
}
+ amba_vcore_enable(adev);
+ amba_pclk_enable(adev);
+ load_ssp_default_config(pl022);
+ amba_pclk_disable(adev);
+ amba_vcore_disable(adev);
dev_dbg(&adev->dev, "suspended\n");
return 0;
}