summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@linux-m68k.org>2014-03-11 10:59:12 +0100
committerMark Brown <broonie@linaro.org>2014-03-11 10:45:53 +0000
commit490c97747d5dc77dfb5826e2823b41d8b2ef7ecc (patch)
tree9cfd2ac813c6fc868871907015a821f1c30b9fc1 /drivers
parentba824d4971691a7f1f66429e378a08a95fbb5b79 (diff)
downloadlinux-490c97747d5dc77dfb5826e2823b41d8b2ef7ecc.tar.bz2
spi: rspi: Add runtime PM support, using spi core auto_runtime_pm
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/spi-rspi.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 92bec7e91046..1fb0ad213324 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -33,6 +33,7 @@
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
#include <linux/of_device.h>
+#include <linux/pm_runtime.h>
#include <linux/sh_dma.h>
#include <linux/spi/spi.h>
#include <linux/spi/rspi.h>
@@ -1111,7 +1112,7 @@ static int rspi_remove(struct platform_device *pdev)
struct rspi_data *rspi = platform_get_drvdata(pdev);
rspi_release_dma(rspi);
- clk_disable_unprepare(rspi->clk);
+ pm_runtime_disable(&pdev->dev);
return 0;
}
@@ -1242,16 +1243,13 @@ static int rspi_probe(struct platform_device *pdev)
goto error1;
}
- ret = clk_prepare_enable(rspi->clk);
- if (ret < 0) {
- dev_err(&pdev->dev, "unable to prepare/enable clock\n");
- goto error1;
- }
+ pm_runtime_enable(&pdev->dev);
init_waitqueue_head(&rspi->wait);
master->bus_num = pdev->id;
master->setup = rspi_setup;
+ master->auto_runtime_pm = true;
master->transfer_one = ops->transfer_one;
master->prepare_message = rspi_prepare_message;
master->unprepare_message = rspi_unprepare_message;
@@ -1312,7 +1310,7 @@ static int rspi_probe(struct platform_device *pdev)
error3:
rspi_release_dma(rspi);
error2:
- clk_disable_unprepare(rspi->clk);
+ pm_runtime_disable(&pdev->dev);
error1:
spi_master_put(master);