diff options
author | Viresh Kumar <viresh.kumar@linaro.com> | 2012-08-27 07:07:17 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2012-09-13 07:09:51 +0200 |
commit | 3f09e6c0d32398b777b00c21053a1ef5f840b1af (patch) | |
tree | f10a832525ff9efc480861209656ec3b1d7aee81 /drivers/ata | |
parent | ata: add platform driver for Calxeda AHCI controller (diff) | |
download | linux-3f09e6c0d32398b777b00c21053a1ef5f840b1af.tar.xz linux-3f09e6c0d32398b777b00c21053a1ef5f840b1af.zip |
pata_arasan: Add clk_{un}prepare() support
clk_{un}prepare is mandatory for platforms using common clock framework. Since
this driver is used by SPEAr platform, which supports common clock framework,
add clk_{un}prepare() support for it.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_arasan_cf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index bfaa5cb1629a..d82c6dc0c20c 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c @@ -310,7 +310,7 @@ static int cf_init(struct arasan_cf_dev *acdev) unsigned long flags; int ret = 0; - ret = clk_enable(acdev->clk); + ret = clk_prepare_enable(acdev->clk); if (ret) { dev_dbg(acdev->host->dev, "clock enable failed"); return ret; @@ -340,7 +340,7 @@ static void cf_exit(struct arasan_cf_dev *acdev) writel(readl(acdev->vbase + OP_MODE) & ~CFHOST_ENB, acdev->vbase + OP_MODE); spin_unlock_irqrestore(&acdev->host->lock, flags); - clk_disable(acdev->clk); + clk_disable_unprepare(acdev->clk); } static void dma_callback(void *dev) |