diff options
| author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2012-06-05 06:29:41 +0200 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-06-12 18:32:55 +0200 |
| commit | 61c3b1971ad4c71c99919da949ac2043dfac8ee7 (patch) | |
| tree | 7cce4a814f6ddb3b2c1714f9df4af2c3cd2f1657 | |
| parent | spi/tegra: add clk_prepare/clk_unprepare (diff) | |
| download | linux-61c3b1971ad4c71c99919da949ac2043dfac8ee7.tar.xz linux-61c3b1971ad4c71c99919da949ac2043dfac8ee7.zip | |
staging: nvec: add clk_prepare/clk_unprepare
Use clk_prepare/clk_unprepare as required by the generic clk framework.
Cc: gregkh@linuxfoundation.org
Cc: ac100@lists.launchpad.net
Cc: devel@driverdev.osuosl.org
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Marc Dietrich <marvin24@gmx.de>
| -rw-r--r-- | drivers/staging/nvec/nvec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 3c60088871e0..9356886f489b 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -675,7 +675,7 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec) { u32 val; - clk_enable(nvec->i2c_clk); + clk_prepare_enable(nvec->i2c_clk); tegra_periph_reset_assert(nvec->i2c_clk); udelay(2); @@ -695,14 +695,14 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec) enable_irq(nvec->irq); - clk_disable(nvec->i2c_clk); + clk_disable_unprepare(nvec->i2c_clk); } static void nvec_disable_i2c_slave(struct nvec_chip *nvec) { disable_irq(nvec->irq); writel(I2C_SL_NEWSL | I2C_SL_NACK, nvec->base + I2C_SL_CNFG); - clk_disable(nvec->i2c_clk); + clk_disable_unprepare(nvec->i2c_clk); } static void nvec_power_off(void) @@ -812,7 +812,7 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev) tegra_init_i2c_slave(nvec); - clk_enable(i2c_clk); + clk_prepare_enable(i2c_clk); /* enable event reporting */ |