Unverified Commit 336a2d93 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: ssm: Use modern ASoC DAI format terminology 

Merge series from Mark Brown <broonie@kernel.org>:

Trivial updates to modernise the various ssm* drivers to the new
DAI clocking constants.
parents e7ab03bc 627a1814

sound/soc/codecs/ssm2518.c

+2 −2
Original line number Diff line number Diff line
@@ -409,8 +409,8 @@ static int ssm2518_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	bool invert_fclk;

	int ret;



	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_CBC_CFC:

		break;

	default:

		return -EINVAL;

sound/soc/codecs/ssm2602.c

+3 −3
Original line number Diff line number Diff line
@@ -411,11 +411,11 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai, 
	unsigned int iface = 0;



	/* set master/slave audio interface */

	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBM_CFM:

	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBP_CFP:

		iface |= 0x0040;

		break;

	case SND_SOC_DAIFMT_CBS_CFS:

	case SND_SOC_DAIFMT_CBC_CFC:

		break;

	default:

		return -EINVAL;

sound/soc/codecs/ssm4567.c

+2 −2
Original line number Diff line number Diff line
@@ -278,8 +278,8 @@ static int ssm4567_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) 
	unsigned int ctrl1 = 0;

	bool invert_fclk;



	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_CBC_CFC:

		break;

	default:

		return -EINVAL;