shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "i2s: add gate clk control"

Browse Source 
This reverts commit 3414f13079.
This commit is contained in:
dkl
2014-04-01 16:02:26 +08:00
parent b8f4596efc
commit edbd399fc8
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/rk3288.dtsi
View File

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

18
sound/soc/rockchip/rk30_i2s.c
View File

@@ -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");