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

Commit 6e84b976 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: cs42l73: Don't mix SNDRV_PCM_RATE_KNOT with specific rates 



SNDRV_PCM_RATE_KNOT means that the device can support rates that can not be
expressed using the rate bits. The driver will provide a list of those rates
specified through constraints. Any rate bits that are set in the rates mask will
be ignored. So setting other rate bits besides SNDRV_PCM_RATE_KNOT wont have any
effect, but might be confusing to the casual reader, so remove them.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarBrian Austin <brian.austin@cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

sound/soc/codecs/cs42l73.c

+6 −9
Original line number Diff line number Diff line
@@ -1255,9 +1255,6 @@ static int cs42l73_pcm_startup(struct snd_pcm_substream *substream, 
	return 0;

}



/* SNDRV_PCM_RATE_KNOT -> 12000, 24000 Hz, limit with constraint list */

#define CS42L73_RATES (SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_KNOT)





#define CS42L73_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\

	SNDRV_PCM_FMTBIT_S24_LE)
@@ -1278,14 +1275,14 @@ static struct snd_soc_dai_driver cs42l73_dai[] = { 
			.stream_name = "XSP Playback",

			.channels_min = 1,

			.channels_max = 2,

			.rates = CS42L73_RATES,

			.rates = SNDRV_PCM_RATE_KNOT,

			.formats = CS42L73_FORMATS,

		},

		.capture = {

			.stream_name = "XSP Capture",

			.channels_min = 1,

			.channels_max = 2,

			.rates = CS42L73_RATES,

			.rates = SNDRV_PCM_RATE_KNOT,

			.formats = CS42L73_FORMATS,

		},

		.ops = &cs42l73_ops,
@@ -1298,14 +1295,14 @@ static struct snd_soc_dai_driver cs42l73_dai[] = { 
			.stream_name = "ASP Playback",

			.channels_min = 2,

			.channels_max = 2,

			.rates = CS42L73_RATES,

			.rates = SNDRV_PCM_RATE_KNOT,

			.formats = CS42L73_FORMATS,

		},

		.capture = {

			.stream_name = "ASP Capture",

			.channels_min = 2,

			.channels_max = 2,

			.rates = CS42L73_RATES,

			.rates = SNDRV_PCM_RATE_KNOT,

			.formats = CS42L73_FORMATS,

		},

		.ops = &cs42l73_ops,
@@ -1318,14 +1315,14 @@ static struct snd_soc_dai_driver cs42l73_dai[] = { 
			.stream_name = "VSP Playback",

			.channels_min = 1,

			.channels_max = 2,

			.rates = CS42L73_RATES,

			.rates = SNDRV_PCM_RATE_KNOT,

			.formats = CS42L73_FORMATS,

		},

		.capture = {

			.stream_name = "VSP Capture",

			.channels_min = 1,

			.channels_max = 2,

			.rates = CS42L73_RATES,

			.rates = SNDRV_PCM_RATE_KNOT,

			.formats = CS42L73_FORMATS,

		},

		.ops = &cs42l73_ops,