Re: [PATCH v3] davinci-mcasp: don't overwrite DIT settings

[Daniel Mack <zonque@gmail.com>]

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