diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:06 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:06 -0400 |
commit | 85cac431329bd09f7d30d489591d7af0d658b008 (patch) | |
tree | 8e81e687c9104c297b9d985e2c5f37f05a6e4b83 /drivers/spi/spi-pxa2xx.c | |
parent | 793b3cb6acc081e557dabcf11ce781d64dafb4d4 (diff) | |
parent | b6460366fbadc160604f50047d0394c7fc39ceab (diff) |
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
-rw-r--r-- | drivers/spi/spi-pxa2xx.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index e0fd6f63c93e..2eb06ee0b326 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c | |||
@@ -811,14 +811,6 @@ static int pxa2xx_spi_transfer_one_message(struct spi_master *master, | |||
811 | return 0; | 811 | return 0; |
812 | } | 812 | } |
813 | 813 | ||
814 | static int pxa2xx_spi_prepare_transfer(struct spi_master *master) | ||
815 | { | ||
816 | struct driver_data *drv_data = spi_master_get_devdata(master); | ||
817 | |||
818 | pm_runtime_get_sync(&drv_data->pdev->dev); | ||
819 | return 0; | ||
820 | } | ||
821 | |||
822 | static int pxa2xx_spi_unprepare_transfer(struct spi_master *master) | 814 | static int pxa2xx_spi_unprepare_transfer(struct spi_master *master) |
823 | { | 815 | { |
824 | struct driver_data *drv_data = spi_master_get_devdata(master); | 816 | struct driver_data *drv_data = spi_master_get_devdata(master); |
@@ -827,8 +819,6 @@ static int pxa2xx_spi_unprepare_transfer(struct spi_master *master) | |||
827 | write_SSCR0(read_SSCR0(drv_data->ioaddr) & ~SSCR0_SSE, | 819 | write_SSCR0(read_SSCR0(drv_data->ioaddr) & ~SSCR0_SSE, |
828 | drv_data->ioaddr); | 820 | drv_data->ioaddr); |
829 | 821 | ||
830 | pm_runtime_mark_last_busy(&drv_data->pdev->dev); | ||
831 | pm_runtime_put_autosuspend(&drv_data->pdev->dev); | ||
832 | return 0; | 822 | return 0; |
833 | } | 823 | } |
834 | 824 | ||
@@ -1141,8 +1131,8 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) | |||
1141 | master->cleanup = cleanup; | 1131 | master->cleanup = cleanup; |
1142 | master->setup = setup; | 1132 | master->setup = setup; |
1143 | master->transfer_one_message = pxa2xx_spi_transfer_one_message; | 1133 | master->transfer_one_message = pxa2xx_spi_transfer_one_message; |
1144 | master->prepare_transfer_hardware = pxa2xx_spi_prepare_transfer; | ||
1145 | master->unprepare_transfer_hardware = pxa2xx_spi_unprepare_transfer; | 1134 | master->unprepare_transfer_hardware = pxa2xx_spi_unprepare_transfer; |
1135 | master->auto_runtime_pm = true; | ||
1146 | 1136 | ||
1147 | drv_data->ssp_type = ssp->type; | 1137 | drv_data->ssp_type = ssp->type; |
1148 | drv_data->null_dma_buf = (u32 *)PTR_ALIGN(&drv_data[1], DMA_ALIGNMENT); | 1138 | drv_data->null_dma_buf = (u32 *)PTR_ALIGN(&drv_data[1], DMA_ALIGNMENT); |