[alsa-devel] [PATCH v4 1/2] ALSA: ASoC: davinci-mcasp: don't configure AFSX direction in DIT mode
From: Yegor Yefremov yegorslists@googlemail.com
AFSX won't be used in DIT mode. The related pins are AHCLKX and the data pins.
Signed-off-by: Yegor Yefremov yegorslists@googlemail.com Acked-by: Vaibhav Bedia vaibhav.bedia@ti.com --- v4: change subjuct to include "ALSA: ASoC: "
sound/soc/davinci/davinci-mcasp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 9321e5c..90a9b99 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -772,9 +772,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) { - /* Set the PDIR for Serialiser as output */ - mcasp_set_bits(dev->base + DAVINCI_MCASP_PDIR_REG, AFSX); - /* TXMASK for 24 bits */ mcasp_set_reg(dev->base + DAVINCI_MCASP_TXMASK_REG, 0x00FFFFFF);
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 --- v4: change subjuct to include "ALSA: ASoC: " 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,
On 04.03.2013 11:34, 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
For both, wrt a survived regression test :)
Tested-by: Daniel Mack zonque@gmail.com
Thanks, Daniel
v4: change subjuct to include "ALSA: ASoC: " 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,
On Mon, Mar 4, 2013 at 11:43 AM, Daniel Mack zonque@gmail.com wrote:
On 04.03.2013 11:34, 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
For both, wrt a survived regression test :)
Tested-by: Daniel Mack zonque@gmail.com
Thanks.
How do you make the test? Is it "doesn't break compilation" test? Or do you have S/PDIF capable device?
Yegor
On 04.03.2013 11:58, Yegor Yefremov wrote:
On Mon, Mar 4, 2013 at 11:43 AM, Daniel Mack zonque@gmail.com wrote:
On 04.03.2013 11:34, 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
For both, wrt a survived regression test :)
Tested-by: Daniel Mack zonque@gmail.com
Thanks.
How do you make the test? Is it "doesn't break compilation" test? Or do you have S/PDIF capable device?
No, I'm running the driver in IIS mode, with a codec attached to the I2S lines. All I can do for now is test that your patches do not break my environment. I can not test DIT.
Daniel
On Mon, Mar 4, 2013 at 12:02 PM, Daniel Mack zonque@gmail.com wrote:
On 04.03.2013 11:58, Yegor Yefremov wrote:
On Mon, Mar 4, 2013 at 11:43 AM, Daniel Mack zonque@gmail.com wrote:
On 04.03.2013 11:34, 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
For both, wrt a survived regression test :)
Tested-by: Daniel Mack zonque@gmail.com
Thanks.
How do you make the test? Is it "doesn't break compilation" test? Or do you have S/PDIF capable device?
No, I'm running the driver in IIS mode, with a codec attached to the I2S lines. All I can do for now is test that your patches do not break my environment. I can not test DIT.
O.K. I see. That is actually, what I wonted to know, if it doesn't break i2s.
Yegor
participants (3)
-
Daniel Mack -
Yegor Yefremov -
yegorslists＠googlemail.com