All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ALSA: ASoC: TWL4030 codec - fix 256*Fs clock
@ 2008-11-05 21:51 Grazvydas Ignotas
  2008-11-05 22:24 ` Steve Sakoman
  0 siblings, 1 reply; 2+ messages in thread
From: Grazvydas Ignotas @ 2008-11-05 21:51 UTC (permalink / raw)
  To: alsa-devel; +Cc: broonie, Grazvydas Ignotas, steve

According to TRM, 256*Fs clock output should be enabled
when TWL4030 is in slave mode, not master.
This allows sound to work on OMAP3 Pandora, which uses
256*Fs clock.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
---
 sound/soc/codecs/twl4030.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index ee2f0d3..90f3b4d 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -469,11 +469,11 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
 	case SND_SOC_DAIFMT_CBM_CFM:
 		format &= ~(TWL4030_AIF_SLAVE_EN);
-		format |= TWL4030_CLK256FS_EN;
+		format &= ~(TWL4030_CLK256FS_EN);
 		break;
 	case SND_SOC_DAIFMT_CBS_CFS:
-		format &= ~(TWL4030_CLK256FS_EN);
 		format |= TWL4030_AIF_SLAVE_EN;
+		format |= TWL4030_CLK256FS_EN;
 		break;
 	default:
 		return -EINVAL;
-- 
1.5.4.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ALSA: ASoC: TWL4030 codec - fix 256*Fs clock
  2008-11-05 21:51 [PATCH] ALSA: ASoC: TWL4030 codec - fix 256*Fs clock Grazvydas Ignotas
@ 2008-11-05 22:24 ` Steve Sakoman
  0 siblings, 0 replies; 2+ messages in thread
From: Steve Sakoman @ 2008-11-05 22:24 UTC (permalink / raw)
  To: Grazvydas Ignotas; +Cc: alsa-devel, broonie

On Wed, 2008-11-05 at 23:51 +0200, Grazvydas Ignotas wrote:
> According to TRM, 256*Fs clock output should be enabled
> when TWL4030 is in slave mode, not master.
> This allows sound to work on OMAP3 Pandora, which uses
> 256*Fs clock.
> 
> Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>

Acked-by: Steve Sakoman <steve@sakoman.com>

As we discussed on IRC you are correct!  I apologize for not making this
change when I resubmitted the patches last week.  Somehow fell off my
todo list.

Steve

> ---
>  sound/soc/codecs/twl4030.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
> index ee2f0d3..90f3b4d 100644
> --- a/sound/soc/codecs/twl4030.c
> +++ b/sound/soc/codecs/twl4030.c
> @@ -469,11 +469,11 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,
>  	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
>  	case SND_SOC_DAIFMT_CBM_CFM:
>  		format &= ~(TWL4030_AIF_SLAVE_EN);
> -		format |= TWL4030_CLK256FS_EN;
> +		format &= ~(TWL4030_CLK256FS_EN);
>  		break;
>  	case SND_SOC_DAIFMT_CBS_CFS:
> -		format &= ~(TWL4030_CLK256FS_EN);
>  		format |= TWL4030_AIF_SLAVE_EN;
> +		format |= TWL4030_CLK256FS_EN;
>  		break;
>  	default:
>  		return -EINVAL;

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-11-05 22:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-05 21:51 [PATCH] ALSA: ASoC: TWL4030 codec - fix 256*Fs clock Grazvydas Ignotas
2008-11-05 22:24 ` Steve Sakoman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.