Add clk_prepare/clk_unprepare

Use clk_prepare/clk_unprepare as required by the generic clk framework.

Signed-off-by Prashant Gaikwad <[email protected]>

---
Please ignore previous versions. Updated commit message and maintainers properly in this version. No other change.

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.

 drivers/input/keyboard/tegra-kbc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/input/keyboard/tegra-kbc.c +2 -2

index 4ffe64d..2c1c9ed 100644
@@ -492,7 +492,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc)
 	unsigned int debounce_cnt;
 	u32 val = 0;
 
-	clk_enable(kbc->clk);
+	clk_prepare_enable(kbc->clk);
 
 	/* Reset the KBC controller to clear all previous status.*/
 	tegra_periph_reset_assert(kbc->clk);

@@ -556,7 +556,7 @@ static void tegra_kbc_stop(struct tegra_kbc *kbc)
 	disable_irq(kbc->irq);
 	del_timer_sync(&kbc->timer);
 
-	clk_disable(kbc->clk);
+	clk_disable_unprepare(kbc->clk);
 }
 
 static int tegra_kbc_open(struct input_dev *dev)

Signature · 6 lines

1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Use clk_prepare/clk_unprepare as required by the generic clk framework.

Signed-off-by Prashant Gaikwad <[email protected]>

---
Please ignore previous versions. Updated commit message and maintainers properly in this version. No other change.

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.

 drivers/staging/nvec/nvec.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

drivers/staging/nvec/nvec.c +3 -3

index 3c60088..9356886 100644
@@ -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)

drivers/staging/nvec/nvec.c +1 -1

@@ -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.

Use clk_prepare/clk_unprepare as required by the generic clk framework.

Signed-off-by Prashant Gaikwad <[email protected]>

---
Please ignore previous versions. Updated commit message and maintainers properly in this version. No other change.

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.

 sound/soc/tegra/tegra20_i2s.c      |    4 ++--
 sound/soc/tegra/tegra20_spdif.c    |    4 ++--
 sound/soc/tegra/tegra30_ahub.c     |    8 ++++----
 sound/soc/tegra/tegra30_i2s.c      |    4 ++--
 sound/soc/tegra/tegra_asoc_utils.c |   12 ++++++------
 5 files changed, 16 insertions(+), 16 deletions(-)

sound/soc/tegra/tegra20_i2s.c +1 -1

index 0c7af63..1647dbf 100644
@@ -62,7 +62,7 @@ static int tegra20_i2s_runtime_suspend(struct device
 *dev)
 {
       struct tegra20_i2s *i2s = dev_get_drvdata(dev);
 
-       clk_disable(i2s->clk_i2s);
+       clk_disable_unprepare(i2s->clk_i2s);
 
       return 0;

}

sound/soc/tegra/tegra20_i2s.c +1 -1

@@ -72,7 +72,7 @@ static int tegra20_i2s_runtime_resume(struct device *dev)
       struct tegra20_i2s *i2s = dev_get_drvdata(dev);
       int ret;
 
-       ret = clk_enable(i2s->clk_i2s);
+       ret = clk_prepare_enable(i2s->clk_i2s);
       if (ret) {
               dev_err(dev, "clk_enable failed: %d\n", ret);
               return ret;

sound/soc/tegra/tegra20_spdif.c +1 -1

index f9b5741..2262e4f 100644
@@ -54,7 +54,7 @@ static int tegra20_spdif_runtime_suspend(struct device
 *dev)
 {
       struct tegra20_spdif *spdif = dev_get_drvdata(dev);
 
-       clk_disable(spdif->clk_spdif_out);
+       clk_disable_unprepare(spdif->clk_spdif_out);
 
       return 0;

}

sound/soc/tegra/tegra20_spdif.c +1 -1

@@ -64,7 +64,7 @@ static int tegra20_spdif_runtime_resume(struct device
 *dev)
       struct tegra20_spdif *spdif = dev_get_drvdata(dev);
       int ret;
 
-       ret = clk_enable(spdif->clk_spdif_out);
+       ret = clk_prepare_enable(spdif->clk_spdif_out);
       if (ret) {
               dev_err(dev, "clk_enable failed: %d\n", ret);

               return ret;

sound/soc/tegra/tegra30_ahub.c +2 -2

index 57cd419..1efb822 100644
@@ -56,8 +56,8 @@ static int tegra30_ahub_runtime_suspend(struct device
 *dev)
       regcache_cache_only(ahub->regmap_apbif, true);
       regcache_cache_only(ahub->regmap_ahub, true);
 
-       clk_disable(ahub->clk_apbif);
-       clk_disable(ahub->clk_d_audio);
+       clk_disable_unprepare(ahub->clk_apbif);
+       clk_disable_unprepare(ahub->clk_d_audio);
 
       return 0;

}

sound/soc/tegra/tegra30_ahub.c +2 -2

@@ -77,12 +77,12 @@ static int tegra30_ahub_runtime_resume(struct device
 *dev)
 {
       int ret;
 
-       ret = clk_enable(ahub->clk_d_audio);
+       ret = clk_prepare_enable(ahub->clk_d_audio);
       if (ret) {
               dev_err(dev, "clk_enable d_audio failed: %d\n", ret);
               return ret;
       }
-       ret = clk_enable(ahub->clk_apbif);
+       ret = clk_prepare_enable(ahub->clk_apbif);
       if (ret) {
               dev_err(dev, "clk_enable apbif failed: %d\n", ret);

               clk_disable(ahub->clk_d_audio);

sound/soc/tegra/tegra30_i2s.c +1 -1

index 8596032..d308faa 100644
@@ -62,7 +62,7 @@ static int tegra30_i2s_runtime_suspend(struct device
 *dev)
 
       regcache_cache_only(i2s->regmap, true);
 
-       clk_disable(i2s->clk_i2s);
+       clk_disable_unprepare(i2s->clk_i2s);
 
       return 0;

}

sound/soc/tegra/tegra30_i2s.c +1 -1

@@ -72,7 +72,7 @@ static int tegra30_i2s_runtime_resume(struct device *dev)
       struct tegra30_i2s *i2s = dev_get_drvdata(dev);
       int ret;
 
-       ret = clk_enable(i2s->clk_i2s);
+       ret = clk_prepare_enable(i2s->clk_i2s);
       if (ret) {
               dev_err(dev, "clk_enable failed: %d\n", ret);
               return ret;

sound/soc/tegra/tegra_asoc_utils.c +3 -3

index 9515ce5..6872c77 100644
@@ -69,9 +69,9 @@ int tegra_asoc_utils_set_rate(struct
 tegra_asoc_utils_data *data, int srate,
       data->set_baseclock = 0;
       data->set_mclk = 0;
 
-       clk_disable(data->clk_cdev1);
-       clk_disable(data->clk_pll_a_out0);
-       clk_disable(data->clk_pll_a);
+       clk_disable_unprepare(data->clk_cdev1);
+       clk_disable_unprepare(data->clk_pll_a_out0);
+       clk_disable_unprepare(data->clk_pll_a);
 
       err = clk_set_rate(data->clk_pll_a, new_baseclock);

       if (err) {

sound/soc/tegra/tegra_asoc_utils.c +3 -3

@@ -87,19 +87,19 @@ int tegra_asoc_utils_set_rate(struct
 tegra_asoc_utils_data *data, int srate,
 
       /* Don't set cdev1/extern1 rate; it's locked to pll_a_out0 */
 
-       err = clk_enable(data->clk_pll_a);
+       err = clk_prepare_enable(data->clk_pll_a);
       if (err) {
               dev_err(data->dev, "Can't enable pll_a: %d\n", err);
               return err;
       }
 
-       err = clk_enable(data->clk_pll_a_out0);
+       err = clk_prepare_enable(data->clk_pll_a_out0);
       if (err) {
               dev_err(data->dev, "Can't enable pll_a_out0: %d\n", err);
               return err;
       }
 
-       err = clk_enable(data->clk_cdev1);
+       err = clk_prepare_enable(data->clk_cdev1);
       if (err) {
               dev_err(data->dev, "Can't enable cdev1: %d\n", err);

               return err;

--
1.7.4.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Hi Prashant,

On Tue, Jun 5, 2012 at 9:59 AM, Prashant Gaikwad <[email protected]> wrote:

        Use clk_prepare/clk_unprepare as required by the generic clk
        framework.
        
        Signed-off-by: Prashant Gaikwad <[email protected]>
        ---
        Please ignore previous versions. Updated commit message and
        maintainers properly in this version. No other change.
        
        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.
        
         sound/soc/tegra/tegra20_i2s.c      |    4 ++--
         sound/soc/tegra/tegra20_spdif.c    |    4 ++--
         sound/soc/tegra/tegra30_ahub.c     |    8 ++++----
         sound/soc/tegra/tegra30_i2s.c      |    4 ++--
         sound/soc/tegra/tegra_asoc_utils.c |   12 ++++++------
         5 files changed, 16 insertions(+), 16 deletions(-)
        
        diff --git a/sound/soc/tegra/tegra20_i2s.c
        b/sound/soc/tegra/tegra20_i2s.c
        index 0c7af63..1647dbf 100644
        --- a/sound/soc/tegra/tegra20_i2s.c
        +++ b/sound/soc/tegra/tegra20_i2s.c
        @@ -62,7 +62,7 @@ static int
        tegra20_i2s_runtime_suspend(struct device *dev)
         {
               struct tegra20_i2s *i2s = dev_get_drvdata(dev);
        
        -       clk_disable(i2s->clk_i2s);
        +       clk_disable_unprepare(i2s->clk_i2s);
        
               return 0;
         }
        @@ -72,7 +72,7 @@ static int tegra20_i2s_runtime_resume(struct
        device *dev)
               struct tegra20_i2s *i2s = dev_get_drvdata(dev);
               int ret;
        
        -       ret = clk_enable(i2s->clk_i2s);
        +       ret = clk_prepare_enable(i2s->clk_i2s);
               if (ret) {
                       dev_err(dev, "clk_enable failed: %d\n", ret);
                       return ret;
        diff --git a/sound/soc/tegra/tegra20_spdif.c
        b/sound/soc/tegra/tegra20_spdif.c
        index f9b5741..2262e4f 100644
        --- a/sound/soc/tegra/tegra20_spdif.c
        +++ b/sound/soc/tegra/tegra20_spdif.c
        @@ -54,7 +54,7 @@ static int
        tegra20_spdif_runtime_suspend(struct device *dev)
         {
               struct tegra20_spdif *spdif = dev_get_drvdata(dev);
        
        -       clk_disable(spdif->clk_spdif_out);
        +       clk_disable_unprepare(spdif->clk_spdif_out);
        
               return 0;
         }
        @@ -64,7 +64,7 @@ static int
        tegra20_spdif_runtime_resume(struct device *dev)
               struct tegra20_spdif *spdif = dev_get_drvdata(dev);
               int ret;
        
        -       ret = clk_enable(spdif->clk_spdif_out);
        +       ret = clk_prepare_enable(spdif->clk_spdif_out);
               if (ret) {
                       dev_err(dev, "clk_enable failed: %d\n", ret);
                       return ret;
        diff --git a/sound/soc/tegra/tegra30_ahub.c
        b/sound/soc/tegra/tegra30_ahub.c
        index 57cd419..1efb822 100644
        --- a/sound/soc/tegra/tegra30_ahub.c
        +++ b/sound/soc/tegra/tegra30_ahub.c
        @@ -56,8 +56,8 @@ static int
        tegra30_ahub_runtime_suspend(struct device *dev)
               regcache_cache_only(ahub->regmap_apbif, true);
               regcache_cache_only(ahub->regmap_ahub, true);
        
        -       clk_disable(ahub->clk_apbif);
        -       clk_disable(ahub->clk_d_audio);
        +       clk_disable_unprepare(ahub->clk_apbif);
        +       clk_disable_unprepare(ahub->clk_d_audio);
        
               return 0;
         }
        @@ -77,12 +77,12 @@ static int
        tegra30_ahub_runtime_resume(struct device *dev)
         {
               int ret;
        
        -       ret = clk_enable(ahub->clk_d_audio);
        +       ret = clk_prepare_enable(ahub->clk_d_audio);
               if (ret) {
                       dev_err(dev, "clk_enable d_audio failed: %d\n",
        ret);
                       return ret;
               }
        -       ret = clk_enable(ahub->clk_apbif);
        +       ret = clk_prepare_enable(ahub->clk_apbif);
               if (ret) {
                       dev_err(dev, "clk_enable apbif failed: %d\n",
        ret);
                       clk_disable(ahub->clk_d_audio);

Don't you need to make change here to "clk_disable_unprepare" ??

        diff --git a/sound/soc/tegra/tegra30_i2s.c
        b/sound/soc/tegra/tegra30_i2s.c
        index 8596032..d308faa 100644
        --- a/sound/soc/tegra/tegra30_i2s.c
        +++ b/sound/soc/tegra/tegra30_i2s.c
        @@ -62,7 +62,7 @@ static int
        tegra30_i2s_runtime_suspend(struct device *dev)
        
               regcache_cache_only(i2s->regmap, true);
        
        -       clk_disable(i2s->clk_i2s);
        +       clk_disable_unprepare(i2s->clk_i2s);
        
               return 0;
         }
        @@ -72,7 +72,7 @@ static int tegra30_i2s_runtime_resume(struct
        device *dev)
               struct tegra30_i2s *i2s = dev_get_drvdata(dev);
               int ret;
        
        -       ret = clk_enable(i2s->clk_i2s);
        +       ret = clk_prepare_enable(i2s->clk_i2s);
               if (ret) {
                       dev_err(dev, "clk_enable failed: %d\n", ret);
                       return ret;
        diff --git a/sound/soc/tegra/tegra_asoc_utils.c
        b/sound/soc/tegra/tegra_asoc_utils.c
        index 9515ce5..6872c77 100644
        --- a/sound/soc/tegra/tegra_asoc_utils.c
        +++ b/sound/soc/tegra/tegra_asoc_utils.c
        @@ -69,9 +69,9 @@ int tegra_asoc_utils_set_rate(struct
        tegra_asoc_utils_data *data, int srate,
               data->set_baseclock = 0;
               data->set_mclk = 0;
        
        -       clk_disable(data->clk_cdev1);
        -       clk_disable(data->clk_pll_a_out0);
        -       clk_disable(data->clk_pll_a);
        +       clk_disable_unprepare(data->clk_cdev1);
        +       clk_disable_unprepare(data->clk_pll_a_out0);
        +       clk_disable_unprepare(data->clk_pll_a);
        
               err = clk_set_rate(data->clk_pll_a, new_baseclock);
               if (err) {
        @@ -87,19 +87,19 @@ int tegra_asoc_utils_set_rate(struct
        tegra_asoc_utils_data *data, int srate,
        
               /* Don't set cdev1/extern1 rate; it's locked to
        pll_a_out0 */
        
        -       err = clk_enable(data->clk_pll_a);
        +       err = clk_prepare_enable(data->clk_pll_a);
               if (err) {
                       dev_err(data->dev, "Can't enable pll_a: %d\n",
        err);
                       return err;
               }
        
        -       err = clk_enable(data->clk_pll_a_out0);
        +       err = clk_prepare_enable(data->clk_pll_a_out0);
               if (err) {
                       dev_err(data->dev, "Can't enable pll_a_out0: %d
        \n", err);
                       return err;
               }
        
        -       err = clk_enable(data->clk_cdev1);
        +       err = clk_prepare_enable(data->clk_cdev1);
               if (err) {
                       dev_err(data->dev, "Can't enable cdev1: %d\n",
        err);
                       return err;
        --
        1.7.4.1
        
        
        _______________________________________________
        linux-arm-kernel mailing list
        linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
        http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Use clk_prepare/clk_unprepare as required by the generic clk framework.

Signed-off-by Prashant Gaikwad <[email protected]>

This patch set adds use of clk_prepare/clk_unprepare as required by generic clock framework.