* [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit for slave mode
@ 2011-10-27 8:35 Axel Lin
2011-10-27 8:38 ` [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for " Axel Lin
2011-10-27 10:00 ` [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit " Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Axel Lin @ 2011-10-27 8:35 UTC (permalink / raw)
To: linux-kernel
Cc: Liam Girdwood, Mark Brown, Jarkko Nikula, Peter Ujfalusi,
alsa-devel
According to the datasheet:
Digital Audio Interface Format (07h) register:
BIT6: Master/slave mode
0: Slave
1: Master
Current code sets TLV320AIC23_MS_MASTER bit for master mode,
but does not clear it for slave mode.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/tlv320aic23.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index ab27dbc..336de8f 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -430,6 +430,7 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai,
iface_reg |= TLV320AIC23_MS_MASTER;
break;
case SND_SOC_DAIFMT_CBS_CFS:
+ iface_reg &= ~TLV320AIC23_MS_MASTER;
break;
default:
return -EINVAL;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for for slave mode
2011-10-27 8:35 [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit for slave mode Axel Lin
@ 2011-10-27 8:38 ` Axel Lin
2011-10-27 9:17 ` Girdwood, Liam
2011-10-27 11:52 ` Jarkko Nikula
2011-10-27 10:00 ` [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit " Mark Brown
1 sibling, 2 replies; 5+ messages in thread
From: Axel Lin @ 2011-10-27 8:38 UTC (permalink / raw)
To: linux-kernel
Cc: Vladimir Barinov, Liam Girdwood, Mark Brown, Jarkko Nikula,
Peter Ujfalusi, alsa-devel
According to the datasheet:
Page0 / Register8: Audio Serial Data interface Control Register A
BIT 7: Bit Clock Directional Control
0: Bit clock is an input (slave mode)
1: Bit clock is an output (master mode)
BIT 6: Word Clock Directional Control
0: Word clock is an input (slave mode)
1: Word clock is an output (master mode)
Current code sets BIT_CLK_MASTER and WORD_CLK_MASTER bits for master mode,
but does not clear these bits for slave mode.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/tlv320aic3x.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index a77f6ea..14cb553 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1021,6 +1021,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
break;
case SND_SOC_DAIFMT_CBS_CFS:
aic3x->master = 0;
+ iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER);
break;
default:
return -EINVAL;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for for slave mode
2011-10-27 8:38 ` [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for " Axel Lin
@ 2011-10-27 9:17 ` Girdwood, Liam
2011-10-27 11:52 ` Jarkko Nikula
1 sibling, 0 replies; 5+ messages in thread
From: Girdwood, Liam @ 2011-10-27 9:17 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Vladimir Barinov, Mark Brown, Jarkko Nikula,
Peter Ujfalusi, alsa-devel
On 27 October 2011 09:38, Axel Lin <axel.lin@gmail.com> wrote:
> According to the datasheet:
>
> Page0 / Register8: Audio Serial Data interface Control Register A
> BIT 7: Bit Clock Directional Control
> 0: Bit clock is an input (slave mode)
> 1: Bit clock is an output (master mode)
>
> BIT 6: Word Clock Directional Control
> 0: Word clock is an input (slave mode)
> 1: Word clock is an output (master mode)
>
> Current code sets BIT_CLK_MASTER and WORD_CLK_MASTER bits for master mode,
> but does not clear these bits for slave mode.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> sound/soc/codecs/tlv320aic3x.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
> index a77f6ea..14cb553 100644
> --- a/sound/soc/codecs/tlv320aic3x.c
> +++ b/sound/soc/codecs/tlv320aic3x.c
> @@ -1021,6 +1021,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
> break;
> case SND_SOC_DAIFMT_CBS_CFS:
> aic3x->master = 0;
> + iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER);
> break;
> default:
> return -EINVAL;
> --
> 1.7.5.4
>
>
>
>
Both
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for for slave mode
2011-10-27 8:38 ` [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for " Axel Lin
2011-10-27 9:17 ` Girdwood, Liam
@ 2011-10-27 11:52 ` Jarkko Nikula
1 sibling, 0 replies; 5+ messages in thread
From: Jarkko Nikula @ 2011-10-27 11:52 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Vladimir Barinov, Liam Girdwood, Mark Brown,
Peter Ujfalusi, alsa-devel
On Thu, 2011-10-27 at 16:38 +0800, Axel Lin wrote:
> According to the datasheet:
>
> Page0 / Register8: Audio Serial Data interface Control Register A
> BIT 7: Bit Clock Directional Control
> 0: Bit clock is an input (slave mode)
> 1: Bit clock is an output (master mode)
>
> BIT 6: Word Clock Directional Control
> 0: Word clock is an input (slave mode)
> 1: Word clock is an output (master mode)
>
> Current code sets BIT_CLK_MASTER and WORD_CLK_MASTER bits for master mode,
> but does not clear these bits for slave mode.
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> sound/soc/codecs/tlv320aic3x.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
This is not entirely true - there is this fussy '& 0x3f' operation that
does clear those bits a few code lines above your change. Now we can rid
of it thanks to your patch, hopefully for iface_breg too (in case if you
are going to send an another patch as this is applied) :-)
--
Jarkko
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit for slave mode
2011-10-27 8:35 [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit for slave mode Axel Lin
2011-10-27 8:38 ` [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for " Axel Lin
@ 2011-10-27 10:00 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-10-27 10:00 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Liam Girdwood, Jarkko Nikula, Peter Ujfalusi,
alsa-devel
On Thu, Oct 27, 2011 at 04:35:49PM +0800, Axel Lin wrote:
> According to the datasheet:
>
> Digital Audio Interface Format (07h) register:
> BIT6: Master/slave mode
Applied both, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-27 11:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-27 8:35 [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit for slave mode Axel Lin
2011-10-27 8:38 ` [PATCH 2/2] ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for " Axel Lin
2011-10-27 9:17 ` Girdwood, Liam
2011-10-27 11:52 ` Jarkko Nikula
2011-10-27 10:00 ` [PATCH 1/2] ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit " Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).