| Message ID | 1338541968-7961-8-git-send-email-pgaikwad@nvidia.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Friday 01 June 2012 14:42:46 Prashant Gaikwad wrote: > Use clk_prepare/clk_unprepare as required by the generic clk framework. > > This patch should go through Tegra tree since other patches to port Tegra > to generic clock framework are dependent on it. Posting here to get ack from > the maintainers. > > Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> tested and ... Acked-By: Marc Dietrich <marvin24@gmx.de> > --- > 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 3c60088..9356886 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 */ -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 3c60088..9356886 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 */
Use clk_prepare/clk_unprepare as required by the generic clk framework. This patch should go through Tegra tree since other patches to port Tegra to generic clock framework are dependent on it. Posting here to get ack from the maintainers. Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com> --- drivers/staging/nvec/nvec.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)