Commit 376d1a92 authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: fsl_sai: Initialize with software reset 



This patch adds software reset code in dai_probe() so as to make a true init
by clearing SAI's internal logic, including the bit clock generation, status
flags, and FIFO pointers.

Signed-off-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 7d1311b9

sound/soc/fsl/fsl_sai.c

+7 −2
Original line number Diff line number Diff line
@@ -437,8 +437,13 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) 
{

	struct fsl_sai *sai = dev_get_drvdata(cpu_dai->dev);



	regmap_update_bits(sai->regmap, FSL_SAI_TCSR, 0xffffffff, 0x0);

	regmap_update_bits(sai->regmap, FSL_SAI_RCSR, 0xffffffff, 0x0);

	/* Software Reset for both Tx and Rx */

	regmap_write(sai->regmap, FSL_SAI_TCSR, FSL_SAI_CSR_SR);

	regmap_write(sai->regmap, FSL_SAI_RCSR, FSL_SAI_CSR_SR);

	/* Clear SR bit to finish the reset */

	regmap_write(sai->regmap, FSL_SAI_TCSR, 0);

	regmap_write(sai->regmap, FSL_SAI_RCSR, 0);



	regmap_update_bits(sai->regmap, FSL_SAI_TCR1, FSL_SAI_CR1_RFW_MASK,

			   FSL_SAI_MAXBURST_TX * 2);

	regmap_update_bits(sai->regmap, FSL_SAI_RCR1, FSL_SAI_CR1_RFW_MASK,

sound/soc/fsl/fsl_sai.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
/* SAI Transmit/Recieve Control Register */

#define FSL_SAI_CSR_TERE	BIT(31)

#define FSL_SAI_CSR_FR		BIT(25)

#define FSL_SAI_CSR_SR		BIT(24)

#define FSL_SAI_CSR_xF_SHIFT	16

#define FSL_SAI_CSR_xF_W_SHIFT	18

#define FSL_SAI_CSR_xF_MASK	(0x1f << FSL_SAI_CSR_xF_SHIFT)