Add an property "i2s_clk_out", which enables to output clock to outside of rockchip SoCs. Let's make it optional since not each board needs it.

Signed-off-by: Jianqun Xu jay.xu@rock-chips.com --- changes since v1: - make "i2s_clk_out" optional, suggested by Sonny

Documentation/devicetree/bindings/sound/rockchip-i2s.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index 9b82c20..6dedd0d 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt @@ -22,6 +22,10 @@ Required properties: - "i2s_hclk": clock for I2S BUS - "i2s_clk" : clock for I2S controller

+Optional property: + - "i2s_clk_out" : clock output to outside of chip, usally as master clock for audio + codec chip + Example for rk3288 I2S controller:

i2s@ff890000 { @@ -32,6 +36,6 @@ i2s@ff890000 { #size-cells = <0>; dmas = <&pdma1 0>, <&pdma1 1>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; + clock-names = "i2s_hclk", "i2s_clk", "i2s_clk_out"; + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_CLKOUT>; };

Hi sonny

Thanks, I'm not familiar with it, thanks to remaind me:-) I will modify it at next version together with other changes if someone review it

在 11/19/2014 11:57 AM, Sonny Rao 写道:

Jay,

On Tue, Nov 18, 2014 at 7:07 PM, Jianqun Xu jay.xu@rock-chips.com wrote:

Mostly FYI, but if you take someone else's patch, you should also retain their authorship by saying: From: <person> at the top of the message. I don't really mind, but please keep it in mind for the future, thanks.

...

We need to claim the clock which is driving the codec so that when we enable clock gating, we continue to clock the codec when needed. I make this an optional clock since there might be some applications where we don't need it but can still use the I2S block.

Signed-off-by: Sonny Rao sonnyrao@chromium.org Signed-off-by: Jianqun Xu jay.xu@rock-chips.com

---

sound/soc/rockchip/rockchip_i2s.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index c74ba37..2820ade 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -28,6 +28,7 @@ struct rk_i2s_dev {

    struct clk *hclk;
    struct clk *mclk;

•   struct clk *oclk;
  
    struct snd_dmaengine_dai_dma_data capture_dma_data;
    struct snd_dmaengine_dai_dma_data playback_dma_data;
  

@@ -439,6 +440,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev) return PTR_ERR(i2s->mclk); }

•   i2s->oclk = devm_clk_get(&pdev->dev, "i2s_clk_out");
  

•   if (IS_ERR(i2s->oclk)) {
  

•           dev_dbg(&pdev->dev, "Didn't find output clock\n");
  

•           i2s->oclk = NULL;
  

•   }
  

•   if (i2s->oclk)
  

•           ret = clk_prepare_enable(i2s->oclk);
  

•   res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    regs = devm_ioremap_resource(&pdev->dev, res);
    if (IS_ERR(regs))
  

@@ -505,6 +514,8 @@ static int rockchip_i2s_remove(struct platform_device *pdev) if (!pm_runtime_status_suspended(&pdev->dev)) i2s_runtime_suspend(&pdev->dev);

•   if (i2s->oclk)
  

•           clk_disable_unprepare(i2s->oclk);
    clk_disable_unprepare(i2s->mclk);
    clk_disable_unprepare(i2s->hclk);
    snd_dmaengine_pcm_unregister(&pdev->dev);
  

-- 1.9.1

Hi Jianqun,

Am Mittwoch, 19. November 2014, 16:09:27 schrieb Jianqun Xu:

Patch is from Sonny Rao sonnyrao@chromium.org

that line above should read exactly: From: Sonny Rao sonnyrao@chromium.org

that way git will also set the author correctly when importing the patch mbox.

We need to claim the clock which is driving the codec so that when we enable clock gating, we continue to clock the codec when needed. I make this an optional clock since there might be some applications where we don't need it but can still use the I2S block.

Signed-off-by: Sonny Rao sonnyrao@chromium.org

I think we you're submitting someone elses patch you'll need a Signed-off-by line for yourself too [which marks that you were allowed to submit it etc], so it should read something like

Signed-off-by: Sonny Rao sonnyrao@chromium.org Signed-off-by: Jianqun Xu jay.xu@rock-chips.com

---

changes since v1:

• modify commit message

sound/soc/rockchip/rockchip_i2s.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index c74ba37..2820ade 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -28,6 +28,7 @@ struct rk_i2s_dev {

struct clk *hclk; struct clk *mclk;

• struct clk *oclk;

  struct snd_dmaengine_dai_dma_data capture_dma_data; struct snd_dmaengine_dai_dma_data playback_dma_data;

@@ -439,6 +440,14 @@ static int rockchip_i2s_probe(struct platform_device *pdev) return PTR_ERR(i2s->mclk); }

• i2s->oclk = devm_clk_get(&pdev->dev, "i2s_clk_out");
• if (IS_ERR(i2s->oclk)) {

• dev_dbg(&pdev->dev, "Didn't find output clock\n");
  

• i2s->oclk = NULL;
  

• }

blank line here?

• if (i2s->oclk)

• ret = clk_prepare_enable(i2s->oclk);
  

• res = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(regs))

@@ -505,6 +514,8 @@ static int rockchip_i2s_remove(struct platform_device *pdev) if (!pm_runtime_status_suspended(&pdev->dev)) i2s_runtime_suspend(&pdev->dev);

• if (i2s->oclk)

• clk_disable_unprepare(i2s->oclk);
  

  clk_disable_unprepare(i2s->mclk); clk_disable_unprepare(i2s->hclk); snd_dmaengine_pcm_unregister(&pdev->dev);

Heiko