spi: omap2-mcspi: Call pm_runtime_* functions directly
Call the pm_runtime functions directly making room for possible pm optimisations. Also the runtime functions aren't just about enabling and disabling of clocks though it does enable clocks also. Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
af4e944dbd
commit
034d3dc988
|
@ -260,16 +260,6 @@ static void omap2_mcspi_restore_ctx(struct omap2_mcspi *mcspi)
|
||||||
list_for_each_entry(cs, &ctx->cs, node)
|
list_for_each_entry(cs, &ctx->cs, node)
|
||||||
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
|
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
|
||||||
}
|
}
|
||||||
static void omap2_mcspi_disable_clocks(struct omap2_mcspi *mcspi)
|
|
||||||
{
|
|
||||||
pm_runtime_mark_last_busy(mcspi->dev);
|
|
||||||
pm_runtime_put_autosuspend(mcspi->dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int omap2_mcspi_enable_clocks(struct omap2_mcspi *mcspi)
|
|
||||||
{
|
|
||||||
return pm_runtime_get_sync(mcspi->dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int omap2_prepare_transfer(struct spi_master *master)
|
static int omap2_prepare_transfer(struct spi_master *master)
|
||||||
{
|
{
|
||||||
|
@ -848,12 +838,13 @@ static int omap2_mcspi_setup(struct spi_device *spi)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = omap2_mcspi_enable_clocks(mcspi);
|
ret = pm_runtime_get_sync(mcspi->dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = omap2_mcspi_setup_transfer(spi, NULL);
|
ret = omap2_mcspi_setup_transfer(spi, NULL);
|
||||||
omap2_mcspi_disable_clocks(mcspi);
|
pm_runtime_mark_last_busy(mcspi->dev);
|
||||||
|
pm_runtime_put_autosuspend(mcspi->dev);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1067,7 +1058,7 @@ static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
|
||||||
struct omap2_mcspi_regs *ctx = &mcspi->ctx;
|
struct omap2_mcspi_regs *ctx = &mcspi->ctx;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
ret = omap2_mcspi_enable_clocks(mcspi);
|
ret = pm_runtime_get_sync(mcspi->dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -1076,7 +1067,8 @@ static int __devinit omap2_mcspi_master_setup(struct omap2_mcspi *mcspi)
|
||||||
ctx->wakeupenable = OMAP2_MCSPI_WAKEUPENABLE_WKEN;
|
ctx->wakeupenable = OMAP2_MCSPI_WAKEUPENABLE_WKEN;
|
||||||
|
|
||||||
omap2_mcspi_set_master_mode(master);
|
omap2_mcspi_set_master_mode(master);
|
||||||
omap2_mcspi_disable_clocks(mcspi);
|
pm_runtime_mark_last_busy(mcspi->dev);
|
||||||
|
pm_runtime_put_autosuspend(mcspi->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1253,7 +1245,8 @@ static int __devexit omap2_mcspi_remove(struct platform_device *pdev)
|
||||||
mcspi = spi_master_get_devdata(master);
|
mcspi = spi_master_get_devdata(master);
|
||||||
dma_channels = mcspi->dma_channels;
|
dma_channels = mcspi->dma_channels;
|
||||||
|
|
||||||
omap2_mcspi_disable_clocks(mcspi);
|
pm_runtime_mark_last_busy(mcspi->dev);
|
||||||
|
pm_runtime_put_autosuspend(mcspi->dev);
|
||||||
pm_runtime_disable(&pdev->dev);
|
pm_runtime_disable(&pdev->dev);
|
||||||
|
|
||||||
spi_unregister_master(master);
|
spi_unregister_master(master);
|
||||||
|
@ -1278,7 +1271,7 @@ static int omap2_mcspi_resume(struct device *dev)
|
||||||
struct omap2_mcspi_regs *ctx = &mcspi->ctx;
|
struct omap2_mcspi_regs *ctx = &mcspi->ctx;
|
||||||
struct omap2_mcspi_cs *cs;
|
struct omap2_mcspi_cs *cs;
|
||||||
|
|
||||||
omap2_mcspi_enable_clocks(mcspi);
|
pm_runtime_get_sync(mcspi->dev);
|
||||||
list_for_each_entry(cs, &ctx->cs, node) {
|
list_for_each_entry(cs, &ctx->cs, node) {
|
||||||
if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE) == 0) {
|
if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE) == 0) {
|
||||||
/*
|
/*
|
||||||
|
@ -1291,7 +1284,8 @@ static int omap2_mcspi_resume(struct device *dev)
|
||||||
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
|
__raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
omap2_mcspi_disable_clocks(mcspi);
|
pm_runtime_mark_last_busy(mcspi->dev);
|
||||||
|
pm_runtime_put_autosuspend(mcspi->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue