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

Unverified Commit b6c93f7f authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: fsl_ssi: Add DAIFMT define for AC97 



The _fsl_ssi_set_dai_fmt() bypasses an undefined format for AC97
mode. However, it's not really necessary if AC97 has its complete
format defined.

So this patch adds a DAIFMT macro of complete format including a
clock direction and polarity.

Signed-off-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Tested-by: default avatarCaleb Crome <caleb@crome.org>
Tested-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7d67bcb6

sound/soc/fsl/fsl_ssi.c

+12 −3
Original line number Diff line number Diff line
@@ -90,6 +90,16 @@ 
	 SNDRV_PCM_FMTBIT_S24_LE)

#endif



/*

 * In AC97 mode, TXDIR bit is forced to 0 and TFDIR bit is forced to 1:

 *  - SSI inputs external bit clock and outputs frame sync clock -- CBM_CFS

 *  - Also have NB_NF to mark these two clocks will not be inverted

 */

#define FSLSSI_AC97_DAIFMT \

	(SND_SOC_DAIFMT_AC97 | \

	 SND_SOC_DAIFMT_CBM_CFS | \

	 SND_SOC_DAIFMT_NB_NF)



#define FSLSSI_SIER_DBG_RX_FLAGS \

	(SSI_SIER_RFF0_EN | \

	 SSI_SIER_RLS_EN | \
@@ -964,7 +974,6 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev, 
		scr &= ~SSI_SCR_SYS_CLK_EN;

		break;

	default:

		if (!fsl_ssi_is_ac97(ssi))

		return -EINVAL;

	}
@@ -1372,7 +1381,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	sprop = of_get_property(np, "fsl,mode", NULL);

	if (sprop) {

		if (!strcmp(sprop, "ac97-slave"))

			ssi->dai_fmt = SND_SOC_DAIFMT_AC97;

			ssi->dai_fmt = FSLSSI_AC97_DAIFMT;

	}



	/* Select DMA or FIQ */