Skip to content

Commit

Permalink
spi: sirf: Add missing spi_master_{resume,suspend} calls to PM callbacks
Browse files Browse the repository at this point in the history
This is required since commit 2025172 "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>
  • Loading branch information
Axel Lin authored and Mark Brown committed Mar 13, 2014
1 parent eeb7139 commit a82ba3a
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/spi/spi-sirf.c
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,11 @@ static int spi_sirfsoc_suspend(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
struct sirfsoc_spi *sspi = spi_master_get_devdata(master);
int ret;

ret = spi_master_suspend(master);
if (ret)
return ret;

clk_disable(sspi->clk);
return 0;
Expand All @@ -764,7 +769,7 @@ static int spi_sirfsoc_resume(struct device *dev)
writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_RXFIFO_OP);
writel(SIRFSOC_SPI_FIFO_START, sspi->base + SIRFSOC_SPI_TXFIFO_OP);

return 0;
return spi_master_resume(master);
}
#endif

Expand Down

0 comments on commit a82ba3a

Please sign in to comment.