summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorPrashant Gaikwad <pgaikwad@nvidia.com>2012-06-05 09:59:40 +0530
committerStephen Warren <swarren@nvidia.com>2012-06-12 10:32:54 -0600
commitcb53417efc726f3c243eaaeb9fce1d15bda05521 (patch)
tree276ddbf742cb2dc0a99bb5fc29c7c161376b2cd1 /drivers/spi
parentf762470b522014ce4ebda3ecac74eb6658da7d9d (diff)
downloadlinux-3.10-cb53417efc726f3c243eaaeb9fce1d15bda05521.tar.gz
linux-3.10-cb53417efc726f3c243eaaeb9fce1d15bda05521.tar.bz2
linux-3.10-cb53417efc726f3c243eaaeb9fce1d15bda05521.zip
spi/tegra: add clk_prepare/clk_unprepare
Use clk_prepare/clk_unprepare as required by the generic clk framework. Cc: grant.likely@secretlab.ca cc: spi-devel-general@lists.sourceforge.net Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-tegra.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c
index ae6d78a3e91..7f99ff3553a 100644
--- a/drivers/spi/spi-tegra.c
+++ b/drivers/spi/spi-tegra.c
@@ -261,7 +261,7 @@ static void spi_tegra_start_transfer(struct spi_device *spi,
clk_set_rate(tspi->clk, speed);
if (tspi->cur_speed == 0)
- clk_enable(tspi->clk);
+ clk_prepare_enable(tspi->clk);
tspi->cur_speed = speed;
@@ -373,7 +373,7 @@ static void tegra_spi_rx_dma_complete(struct tegra_dma_req *req)
spi = m->state;
spi_tegra_start_message(spi, m);
} else {
- clk_disable(tspi->clk);
+ clk_disable_unprepare(tspi->clk);
tspi->cur_speed = 0;
}
}