Commit f5023af6 authored by Yegor Yefremov's avatar Yegor Yefremov Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: don't overwrite DIT settings 



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: default avatarYegor Yefremov <yegorslists@googlemail.com>
Tested-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2dda75e0

sound/soc/davinci/davinci-mcasp.c

+13 −12
Original line number Diff line number Diff line
@@ -645,16 +645,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;



	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_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;

}
@@ -795,9 +799,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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE