From: dkl <dkl@rock-chips.com>
Date: Tue, 1 Apr 2014 08:02:26 +0000 (+0800)
Subject: Revert "i2s: add  gate clk control"
X-Git-Tag: firefly_0821_release~5673
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=edbd399fc8da44a40086fa9dc3134f04be294043;p=firefly-linux-kernel-4.4.55.git

Revert "i2s: add  gate clk control"

This reverts commit 3414f130791bbd0c51a91934f68bbbc37956b805.
---

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 1ed423e75ce6..749b814e18f3 100755
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -755,8 +755,8 @@
 		compatible = "rockchip-i2s";
 		reg = <0xff890000 0x10000>;
 		i2s-id = <0>;
-		clocks = <&clk_i2s>, <&clk_i2s_out>, <&clk_gates10 8>, <&clk_gates4 3>;
-		clock-names = "i2s_clk", "i2s_mclk", "i2s_hclk", "i2s_gclk";
+		clocks = <&clk_i2s>, <&clk_i2s_out>;
+		clock-names = "i2s_clk","i2s_mclk";
 		interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
 		dmas = <&pdma0 0>,
 			<&pdma0 1>;
diff --git a/sound/soc/rockchip/rk30_i2s.c b/sound/soc/rockchip/rk30_i2s.c
index 2092964de532..f2d466cd2231 100755
--- a/sound/soc/rockchip/rk30_i2s.c
+++ b/sound/soc/rockchip/rk30_i2s.c
@@ -59,8 +59,7 @@ struct rk30_i2s_info {
 
 	struct clk *i2s_clk;// i2s clk ,is bclk lrck
 	struct clk *i2s_mclk;//i2s mclk,rk32xx can different i2s clk.
-	struct clk *i2s_hclk;
-	struct clk *i2s_gclk;
+
 	struct snd_dmaengine_dai_dma_data capture_dma_data;
 	struct snd_dmaengine_dai_dma_data playback_dma_data;
 
@@ -550,21 +549,6 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
 	}
 
 	rk30_i2s = i2s;
-
-	i2s->i2s_hclk = clk_get(&pdev->dev, "i2s_hclk");
-	if(IS_ERR(i2s->i2s_hclk) ) {
-                dev_err(&pdev->dev, "get i2s_hclk failed.\n");
-        } else{
-		clk_prepare_enable(i2s->i2s_hclk);
-	}
-
-	i2s->i2s_gclk = clk_get(&pdev->dev, "i2s_gclk");
-	if(IS_ERR(i2s->i2s_gclk)) {
-		dev_err(&pdev->dev, "get i2s_gclk failed.\n");
-	} else {
-		clk_prepare_enable(i2s->i2s_gclk);
-	}
-
 	i2s->i2s_clk= clk_get(&pdev->dev, "i2s_clk");
 	if (IS_ERR(i2s->i2s_clk)) {
 		dev_err(&pdev->dev, "Can't retrieve i2s clock\n");