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

i2s dts : add clk name

Browse Source
This commit is contained in:
qjb
2014-02-26 14:45:08 +08:00
parent 464b1678a2
commit b9ac1fc4a6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/rk3188.dtsi
View File

@@ -438,6 +438,7 @@
reg = <0x1011a000 0x2000>;
i2s-id = <1>;
clocks = <&clk_i2s>;
clock-names = "i2s_clk";
interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
dmas = <&pdma0 6>,
<&pdma0 7>;

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

@@ -56,7 +56,8 @@ static DEFINE_SPINLOCK(lock);
struct rk30_i2s_info {
void __iomem *regs;
struct clk *i2s_clk;
struct clk *i2s_clk;// i2s clk ,is bclk lrck
struct clk *i2s_mclk;//i2s mclk,rk32xx can different i2s clk.
struct snd_dmaengine_dai_dma_data capture_dma_data;
struct snd_dmaengine_dai_dma_data playback_dma_data;
@@ -523,14 +524,22 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
goto err;
}
i2s->i2s_clk= clk_get(&pdev->dev, NULL);
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");
ret = PTR_ERR(i2s->i2s_clk);
goto err;
}
clk_prepare_enable(i2s->i2s_clk);
clk_set_rate(i2s->i2s_clk, 11289600);
clk_prepare_enable(i2s->i2s_clk);
i2s->i2s_mclk= clk_get(&pdev->dev, "i2s_mclk");
if(IS_ERR(i2s->i2s_mclk) ) {
printk("This platfrom have not i2s_mclk,no need to set i2s_mclk.\n");
}else{
clk_set_rate(i2s->i2s_mclk, 11289600);
clk_prepare_enable(i2s->i2s_mclk);
}
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) {