]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ASoC: samsung: s3c2412-i2s: Move to clk_prepare_enable/clk_disable_unprepare
authorVasily Khoruzhick <anarsoul@gmail.com>
Mon, 23 Jun 2014 20:24:06 +0000 (23:24 +0300)
committerMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 10:57:43 +0000 (11:57 +0100)
Use clk_prepare_enable/clk_disable_unprepare to make the driver
work properly with common clock framework.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
sound/soc/samsung/s3c2412-i2s.c

index d9d27cc0657ca12bf1c4392393f2473994720ce9..d6bc6dc0aafb22157384f3c3180be953bdb42fe6 100644 (file)
@@ -76,7 +76,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
        /* Set MPLL as the source for IIS CLK */
 
        clk_set_parent(s3c2412_i2s.iis_cclk, clk_get(NULL, "mpll"));
-       clk_enable(s3c2412_i2s.iis_cclk);
+       clk_prepare_enable(s3c2412_i2s.iis_cclk);
 
        s3c2412_i2s.iis_cclk = s3c2412_i2s.iis_pclk;
 
@@ -89,7 +89,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai)
 
 static int s3c2412_i2s_remove(struct snd_soc_dai *dai)
 {
-       clk_disable(s3c2412_i2s.iis_cclk);
+       clk_disable_unprepare(s3c2412_i2s.iis_cclk);
 
        return 0;
 }