diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:49:06 +0100 |
| commit | 85cac431329bd09f7d30d489591d7af0d658b008 (patch) | |
| tree | 8e81e687c9104c297b9d985e2c5f37f05a6e4b83 /drivers/spi/spi-s3c64xx.c | |
| parent | 793b3cb6acc081e557dabcf11ce781d64dafb4d4 (diff) | |
| parent | b6460366fbadc160604f50047d0394c7fc39ceab (diff) | |
| download | op-kernel-dev-85cac431329bd09f7d30d489591d7af0d658b008.zip op-kernel-dev-85cac431329bd09f7d30d489591d7af0d658b008.tar.gz | |
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
Diffstat (limited to 'drivers/spi/spi-s3c64xx.c')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 2465d6d..c5bc961 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -356,8 +356,6 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) while (!is_polling(sdd) && !acquire_dma(sdd)) usleep_range(10000, 11000); - pm_runtime_get_sync(&sdd->pdev->dev); - return 0; } @@ -372,7 +370,6 @@ static int s3c64xx_spi_unprepare_transfer(struct spi_master *spi) sdd->ops->release((enum dma_ch)sdd->tx_dma.ch, &s3c64xx_spi_dma_client); } - pm_runtime_put(&sdd->pdev->dev); return 0; } @@ -1395,6 +1392,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) SPI_BPW_MASK(8); /* the spi->mode bits understood by this driver: */ master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; + master->auto_runtime_pm = true; sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res); if (IS_ERR(sdd->regs)) { |
