From 2bf8269ae49f6df3e323e4b7d8818b2dcfd98daa Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Mon, 26 Mar 2012 17:04:22 +0530 Subject: [PATCH] --- yaml --- r: 307639 b: refs/heads/master c: 27b5284cfbe187732ebb184b03ea693f44837f9d h: refs/heads/master i: 307637: b10a572e4d6f1b80e6da912d4a4995e604779044 307635: 30719050c131cf6e79dd170d553ac75cea52cd6d 307631: ae206e150cabe0f10736f6fbd4e9625547b5bbbf v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-omap2-mcspi.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ca9e6b2c042c..c25b3d742b02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bd897f84964c2ce3a28d11f7eb7c4e0a8d3ca3c +refs/heads/master: 27b5284cfbe187732ebb184b03ea693f44837f9d diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c index 1907ed2e2958..0b0da2f7ce23 100644 --- a/trunk/drivers/spi/spi-omap2-mcspi.c +++ b/trunk/drivers/spi/spi-omap2-mcspi.c @@ -44,6 +44,7 @@ #include #define OMAP2_MCSPI_MAX_FREQ 48000000 +#define SPI_AUTOSUSPEND_TIMEOUT 2000 #define OMAP2_MCSPI_REVISION 0x00 #define OMAP2_MCSPI_SYSSTATUS 0x14 @@ -265,7 +266,8 @@ static void omap2_mcspi_restore_ctx(struct omap2_mcspi *mcspi) } static void omap2_mcspi_disable_clocks(struct omap2_mcspi *mcspi) { - pm_runtime_put_sync(mcspi->dev); + pm_runtime_mark_last_busy(mcspi->dev); + pm_runtime_put_autosuspend(mcspi->dev); } static int omap2_mcspi_enable_clocks(struct omap2_mcspi *mcspi) @@ -1212,6 +1214,8 @@ static int __devinit omap2_mcspi_probe(struct platform_device *pdev) if (status < 0) goto dma_chnl_free; + pm_runtime_use_autosuspend(&pdev->dev); + pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT); pm_runtime_enable(&pdev->dev); if (status || omap2_mcspi_master_setup(mcspi) < 0)