ALSA: ASoc: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
Subsystems (3)
PATCH 1/1 ALSA: ASoc: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
This is needed for recent changes in the for-2.6.33 branch.
--- sound/soc/pxa/raumfeld.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/pxa/raumfeld.c +2 -2
@@ -116,7 +116,7 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,return ret;/* setup the CPU DAI */ - ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk); + ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk, clk);if (ret <0 )return ret;
@@ -205,7 +205,7 @@ static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream,return ret;/* setup the CPU DAI */ - ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk); + ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk, clk);if (ret <0 )return ret;
Signature · 1 line
1.6.5.2
Quoted 1 line · Daniel Mack
This is needed for recent changes in the for-2.6.33 branch.
Which changes?
sound/soc/pxa/raumfeld.c static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream, · line 121
Quoted 4 lines
sound/soc/pxa/raumfeld.c +1
-1- ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk); + ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk, clk);if (ret <0 )return ret;
This looks wrong - why would you configure a PLL to produce the same frequency as is being input? I suspect you're trying to update for the addition of the additional source argument to set_pll()...
Quoted 4 lines · Mark Brown
Quoted 1 line · Daniel Mack
This is needed for recent changes in the for-2.6.33 branch.
Which changes?
snd_soc_dai_set_pll() takes an additional argument now.
Quoted 9 lines
Review
Quoted 5 lines
(quoted diff) +1
-1- ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, clk); + ret = snd_soc_dai_set_pll(cpu_dai, 0, 0, clk, clk); if (ret < 0) return ret;This looks wrong - why would you configure a PLL to produce the same frequency as is being input? I suspect you're trying to update for the addition of the additional source argument to
set_pll()...
Ah, right. The pxa-ssp code doesn't pay attention to either argument, hence I didn't notice. Thanks!
Daniel
Quoted 1 line
From
fdc23d80fa7a3b2aa76e05ee9fbd85dea0f647d8Mon Sep 17 00:00:00 2001
From: Daniel Mack <[email protected]>
Date: Mon, 30 Nov 2009 11:08:17 +0100
Subject: [PATCH] ALSA: ASoc: pxa/raumfeld: adopt new snd_soc_dai_set_pll() API
ALSA's for-2.6.33 branch has a new source argument to snd_soc_dai_set_pll().
--- sound/soc/pxa/raumfeld.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/pxa/raumfeld.c +2 -2
@@ -116,7 +116,7 @@ static int raumfeld_cs4270_hw_params(struct snd_pcm_substream *substream,return ret;/* setup the CPU DAI */ - ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk); + ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 ,0 , clk);if (ret <0 )return ret;
@@ -205,7 +205,7 @@ static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream,return ret;/* setup the CPU DAI */ - ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 , clk); + ret =snd_soc_dai_set_pll (cpu_dai,0 ,0 ,0 , clk);if (ret <0 )return ret;
Signature · 1 line
1.6.5.2
Mark Brown
AppliedQuoted 2 lines · Daniel Mack
Ah, right. The pxa-ssp code doesn't pay attention to either argument, hence I didn't notice. Thanks!
OK.
Quoted 7 lines
Daniel
From
fdc23d80fa7a3b2aa76e05ee9fbd85dea0f647d8Mon Sep 17 00:00:00 2001
From: Daniel Mack <[email protected]>
Date: Mon, 30 Nov 2009 11:08:17 +0100
Subject: [PATCH] ALSA: ASoc: pxa/raumfeld: adopt newsnd_soc_dai_set_pll()API
Applied, thanks.
Can I please remind you again to send patches in the format documented in Documentation/SubmittingPatches - when you include lots of text before the actual patch it's not possible to use standard tools like git am to apply without post-processing since all that text ends up in the commit log, and things like From: and the subject line don't get picked up either.