Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b25658ed authored by Jörg Krause's avatar Jörg Krause Committed by Mark Brown
Browse files

ASoC: mxs-saif: fix setting SAIF1 register 



If SAIF0 is used in master and SAIF1 in slave mode setting the SAIF1
register in mxs_saif_set_dai_fmt() does not have any effect on the
interface as the clk gate needs to be cleared before the register can be
written.

Signed-off-by: default avatarJörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

sound/soc/mxs/mxs-saif.c

+10 −0
Original line number Diff line number Diff line
@@ -299,6 +299,16 @@ static int mxs_saif_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) 
		return -EBUSY;

	}



	/* If SAIF1 is configured as slave, the clk gate needs to be cleared

	 * before the register can be written.

	 */

	if (saif->id != saif->master_id) {

		__raw_writel(BM_SAIF_CTRL_SFTRST,

			saif->base + SAIF_CTRL + MXS_CLR_ADDR);

		__raw_writel(BM_SAIF_CTRL_CLKGATE,

			saif->base + SAIF_CTRL + MXS_CLR_ADDR);

	}



	scr0 = __raw_readl(saif->base + SAIF_CTRL);

	scr0 = scr0 & ~BM_SAIF_CTRL_BITCLK_EDGE & ~BM_SAIF_CTRL_LRCLK_POLARITY \

		& ~BM_SAIF_CTRL_JUSTIFY & ~BM_SAIF_CTRL_DELAY;