* [PATCH v3] davinci-mcasp: don't overwrite DIT settings
@ 2013-03-04 10:02 yegorslists
2013-03-04 10:09 ` Daniel Mack
2013-03-04 10:11 ` Daniel Mack
0 siblings, 2 replies; 4+ messages in thread
From: yegorslists @ 2013-03-04 10:02 UTC (permalink / raw)
To: alsa-devel; +Cc: mporter, Yegor Yefremov, vaibhav.bedia, zonque
From: Yegor Yefremov <yegorslists@googlemail.com>
Channel size settings will be made at the end of
davinci_mcasp_hw_params() routine and thus overwrite frame
format settings made for DIT mode. This patch fixes this issue
by taking op_mode into account. Tested with official PSP 3.2
kernel and sii9022a HDMI transmitter.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
v3: don't set mask in davinci_hw_dit_param()
v2: fix checkpatch.pl warnings
sound/soc/davinci/davinci-mcasp.c | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 90a9b99..dcd56f2 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -643,16 +643,20 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
/* mapping of the XSSZ bit-field as described in the datasheet */
fmt = (word_length >> 1) - 1;
- mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
- RXSSZ(fmt), RXSSZ(0x0F));
- mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
- TXSSZ(fmt), TXSSZ(0x0F));
- mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate),
- TXROT(7));
- mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate),
- RXROT(7));
+ if (dev->op_mode != DAVINCI_MCASP_DIT_MODE) {
+ mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
+ RXSSZ(fmt), RXSSZ(0x0F));
+ mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
+ TXSSZ(fmt), TXSSZ(0x0F));
+ mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
+ TXROT(rotate), TXROT(7));
+ mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
+ RXROT(rotate), RXROT(7));
+ mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG,
+ mask);
+ }
+
mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask);
- mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask);
return 0;
}
@@ -772,9 +776,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream)
/* S/PDIF */
static void davinci_hw_dit_param(struct davinci_audio_dev *dev)
{
- /* TXMASK for 24 bits */
- mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF);
-
/* Set the TX format : 24 bit right rotation, 32 bit slot, Pad 0
and LSB first */
mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
--
1.7.7
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] davinci-mcasp: don't overwrite DIT settings
2013-03-04 10:02 [PATCH v3] davinci-mcasp: don't overwrite DIT settings yegorslists
@ 2013-03-04 10:09 ` Daniel Mack
2013-03-04 10:38 ` Yegor Yefremov
2013-03-04 10:11 ` Daniel Mack
1 sibling, 1 reply; 4+ messages in thread
From: Daniel Mack @ 2013-03-04 10:09 UTC (permalink / raw)
To: yegorslists; +Cc: mporter, alsa-devel, vaibhav.bedia
On 04.03.2013 11:02, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> Channel size settings will be made at the end of
> davinci_mcasp_hw_params() routine and thus overwrite frame
> format settings made for DIT mode. This patch fixes this issue
> by taking op_mode into account. Tested with official PSP 3.2
> kernel and sii9022a HDMI transmitter.
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> v3: don't set mask in davinci_hw_dit_param()
> v2: fix checkpatch.pl warnings
> sound/soc/davinci/davinci-mcasp.c | 25 +++++++++++++------------
> 1 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
> index 90a9b99..dcd56f2 100644
> --- a/sound/soc/davinci/davinci-mcasp.c
> +++ b/sound/soc/davinci/davinci-mcasp.c
> @@ -643,16 +643,20 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
> /* mapping of the XSSZ bit-field as described in the datasheet */
> fmt = (word_length >> 1) - 1;
>
> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
> - RXSSZ(fmt), RXSSZ(0x0F));
> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
> - TXSSZ(fmt), TXSSZ(0x0F));
> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate),
> - TXROT(7));
> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate),
> - RXROT(7));
> + if (dev->op_mode != DAVINCI_MCASP_DIT_MODE) {
> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
> + RXSSZ(fmt), RXSSZ(0x0F));
> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
> + TXSSZ(fmt), TXSSZ(0x0F));
> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
> + TXROT(rotate), TXROT(7));
> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
> + RXROT(rotate), RXROT(7));
> + mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG,
> + mask);
> + }
> +
> mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask);
> - mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask);
>
> return 0;
> }
> @@ -772,9 +776,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream)
> /* S/PDIF */
> static void davinci_hw_dit_param(struct davinci_audio_dev *dev)
> {
> - /* TXMASK for 24 bits */
> - mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF);
> -
This last hunk doesn't apply to my tree. There are two lines at the
beginning of the function
/* Set the PDIR for Serialiser as output */
mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AFSX);
which are from a very old commit (b67f4487). Do you have any other
commits in your tree?
Daniel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] davinci-mcasp: don't overwrite DIT settings
2013-03-04 10:02 [PATCH v3] davinci-mcasp: don't overwrite DIT settings yegorslists
2013-03-04 10:09 ` Daniel Mack
@ 2013-03-04 10:11 ` Daniel Mack
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Mack @ 2013-03-04 10:11 UTC (permalink / raw)
To: yegorslists; +Cc: mporter, alsa-devel, vaibhav.bedia
On 04.03.2013 11:02, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> Channel size settings will be made at the end of
> davinci_mcasp_hw_params() routine and thus overwrite frame
> format settings made for DIT mode. This patch fixes this issue
> by taking op_mode into account. Tested with official PSP 3.2
> kernel and sii9022a HDMI transmitter.
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Ah, and when resending, please make sure to prefix your subject with
"ALSA: ASoC: " ...
Daniel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] davinci-mcasp: don't overwrite DIT settings
2013-03-04 10:09 ` Daniel Mack
@ 2013-03-04 10:38 ` Yegor Yefremov
0 siblings, 0 replies; 4+ messages in thread
From: Yegor Yefremov @ 2013-03-04 10:38 UTC (permalink / raw)
To: Daniel Mack; +Cc: Porter, Matt, alsa-devel@alsa-project.org, Vaibhav Bedia
On Mon, Mar 4, 2013 at 11:09 AM, Daniel Mack <zonque@gmail.com> wrote:
> On 04.03.2013 11:02, yegorslists@googlemail.com wrote:
>> From: Yegor Yefremov <yegorslists@googlemail.com>
>>
>> Channel size settings will be made at the end of
>> davinci_mcasp_hw_params() routine and thus overwrite frame
>> format settings made for DIT mode. This patch fixes this issue
>> by taking op_mode into account. Tested with official PSP 3.2
>> kernel and sii9022a HDMI transmitter.
>>
>> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>> ---
>> v3: don't set mask in davinci_hw_dit_param()
>> v2: fix checkpatch.pl warnings
>> sound/soc/davinci/davinci-mcasp.c | 25 +++++++++++++------------
>> 1 files changed, 13 insertions(+), 12 deletions(-)
>>
>> diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
>> index 90a9b99..dcd56f2 100644
>> --- a/sound/soc/davinci/davinci-mcasp.c
>> +++ b/sound/soc/davinci/davinci-mcasp.c
>> @@ -643,16 +643,20 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev,
>> /* mapping of the XSSZ bit-field as described in the datasheet */
>> fmt = (word_length >> 1) - 1;
>>
>> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
>> - RXSSZ(fmt), RXSSZ(0x0F));
>> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
>> - TXSSZ(fmt), TXSSZ(0x0F));
>> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXROT(rotate),
>> - TXROT(7));
>> - mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG, RXROT(rotate),
>> - RXROT(7));
>> + if (dev->op_mode != DAVINCI_MCASP_DIT_MODE) {
>> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
>> + RXSSZ(fmt), RXSSZ(0x0F));
>> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
>> + TXSSZ(fmt), TXSSZ(0x0F));
>> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMT_REG,
>> + TXROT(rotate), TXROT(7));
>> + mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMT_REG,
>> + RXROT(rotate), RXROT(7));
>> + mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG,
>> + mask);
>> + }
>> +
>> mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, mask);
>> - mcasp_set_reg(dev->base + DAVINCI_MCASP_RXMASK_REG, mask);
>>
>> return 0;
>> }
>> @@ -772,9 +776,6 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream)
>> /* S/PDIF */
>> static void davinci_hw_dit_param(struct davinci_audio_dev *dev)
>> {
>> - /* TXMASK for 24 bits */
>> - mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF);
>> -
>
> This last hunk doesn't apply to my tree. There are two lines at the
> beginning of the function
>
> /* Set the PDIR for Serialiser as output */
> mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AFSX);
>
> which are from a very old commit (b67f4487). Do you have any other
> commits in your tree?
I sent one of them an Fr and got Vaibhav's ACK today. Resending as series.
Yegor
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-04 10:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-04 10:02 [PATCH v3] davinci-mcasp: don't overwrite DIT settings yegorslists
2013-03-04 10:09 ` Daniel Mack
2013-03-04 10:38 ` Yegor Yefremov
2013-03-04 10:11 ` Daniel Mack
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).