diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-03-05 02:19:09 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-13 05:57:29 -0400 |
commit | a82ba3a318dd5eaf1f3dcbc335f81770d557a4fc (patch) | |
tree | 759360c4adfdf5afa64446969d6942fb1f1e2b20 /drivers/spi | |
parent | eeb7139524d1851c29b5c02b3dcd6679299a104e (diff) |
spi: sirf: Add missing spi_master_{resume,suspend} calls to PM callbacks
This is required since commit 2025172e3280 "spi/bitbang: Use core message pump".
spi-bitbang now uses core message pump, so it needs to call spi_master_suspend/
spi_master_resume to stop/start the queue while suspend/resume.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-sirf.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index a72b8f87a156..1a77ad52812f 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c | |||
@@ -748,6 +748,11 @@ static int spi_sirfsoc_suspend(struct device *dev) | |||
748 | { | 748 | { |
749 | struct spi_master *master = dev_get_drvdata(dev); | 749 | struct spi_master *master = dev_get_drvdata(dev); |
750 | struct sirfsoc_spi *sspi = spi_master_get_devdata(master); | 750 | struct sirfsoc_spi *sspi = spi_master_get_devdata(master); |
751 | int ret; | ||
752 | |||
753 | ret = spi_master_suspend(master); | ||
754 | if (ret) | ||
755 | return ret; | ||
751 | 756 | ||
752 | clk_disable(sspi->clk); | 757 | clk_disable(sspi->clk); |
753 | return 0; | 758 | return 0; |
@@ -764,7 +769,7 @@ static int spi_sirfsoc_resume(struct device *dev) | |||
764 | writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_RXFIFO_OP); | 769 | writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_RXFIFO_OP); |
765 | writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_TXFIFO_OP); | 770 | writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_TXFIFO_OP); |
766 | 771 | ||
767 | return 0; | 772 | return spi_master_resume(master); |
768 | } | 773 | } |
769 | #endif | 774 | #endif |
770 | 775 | ||