Unverified Commit cbb3a19f authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: js4740-i2s: Update to use set_fmt_new callback 



As part of updating the core to directly tell drivers if they are clock
provider or consumer update this CPU side driver to use the new direct
callback.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-13-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent add9ee8c

sound/soc/jz4740/jz4740-i2s.c

+6 −6
Original line number Diff line number Diff line
@@ -206,18 +206,18 @@ static int jz4740_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) 


	conf &= ~(JZ_AIC_CONF_BIT_CLK_MASTER | JZ_AIC_CONF_SYNC_CLK_MASTER);



	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_BP_FP:

		conf |= JZ_AIC_CONF_BIT_CLK_MASTER | JZ_AIC_CONF_SYNC_CLK_MASTER;

		format |= JZ_AIC_I2S_FMT_ENABLE_SYS_CLK;

		break;

	case SND_SOC_DAIFMT_CBM_CFS:

	case SND_SOC_DAIFMT_BC_FP:

		conf |= JZ_AIC_CONF_SYNC_CLK_MASTER;

		break;

	case SND_SOC_DAIFMT_CBS_CFM:

	case SND_SOC_DAIFMT_BP_FC:

		conf |= JZ_AIC_CONF_BIT_CLK_MASTER;

		break;

	case SND_SOC_DAIFMT_CBM_CFM:

	case SND_SOC_DAIFMT_BC_FC:

		break;

	default:

		return -EINVAL;
@@ -433,7 +433,7 @@ static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = { 
	.shutdown = jz4740_i2s_shutdown,

	.trigger = jz4740_i2s_trigger,

	.hw_params = jz4740_i2s_hw_params,

	.set_fmt = jz4740_i2s_set_fmt,

	.set_fmt_new = jz4740_i2s_set_fmt,

	.set_sysclk = jz4740_i2s_set_sysclk,

};