[alsa-devel] [PATCH] 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.
Signed-off-by: Daniel Mack daniel@caiaq.de Cc: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/pxa/raumfeld.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c index 5d7bb8c..a43a16c 100644 --- a/sound/soc/pxa/raumfeld.c +++ b/sound/soc/pxa/raumfeld.c @@ -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;
On Mon, Nov 30, 2009 at 11:12:44AM +0100, Daniel Mack wrote:
This is needed for recent changes in the for-2.6.33 branch.
Which changes?
- 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()...
On Mon, Nov 30, 2009 at 12:55:43PM +0000, Mark Brown wrote:
On Mon, Nov 30, 2009 at 11:12:44AM +0100, Daniel Mack wrote:
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.
- 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
On Mon, Nov 30, 2009 at 02:06:37PM +0100, Daniel Mack wrote:
Ah, right. The pxa-ssp code doesn't pay attention to either argument, hence I didn't notice. Thanks!
OK.
Daniel
From fdc23d80fa7a3b2aa76e05ee9fbd85dea0f647d8 Mon Sep 17 00:00:00 2001 From: Daniel Mack daniel@caiaq.de Date: Mon, 30 Nov 2009 11:08:17 +0100 Subject: [PATCH] ALSA: ASoc: pxa/raumfeld: adopt new snd_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.
participants (2)
-
Daniel Mack
-
Mark Brown