Bläddra i källkod

ASoC: kirkwood: Fix the CPU DAI rates

This patch fixes the rates declared in the CPU DAI parameters:
- SNDRV_PCM_RATE_KNOT and the discrete rates SNDRV_PCM_RATE_xxx should
  not be used with SNDRV_PCM_RATE_CONTINUOUS,
- SNDRV_PCM_RATE_CONTINUOUS asks for rate_min and rate_max,
- the device may do streaming down to 5512Hz.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>
Jean-Francois Moine 11 år sedan
förälder
incheckning
02fc17c102
1 ändrade filer med 12 tillägg och 12 borttagningar
  1. 12 12
      sound/soc/kirkwood/kirkwood-i2s.c

+ 12 - 12
sound/soc/kirkwood/kirkwood-i2s.c

@@ -473,17 +473,17 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk[2] = {
 	.playback = {
 	.playback = {
 		.channels_min = 1,
 		.channels_min = 1,
 		.channels_max = 2,
 		.channels_max = 2,
-		.rates = SNDRV_PCM_RATE_8000_192000 |
-			 SNDRV_PCM_RATE_CONTINUOUS |
-			 SNDRV_PCM_RATE_KNOT,
+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
+		.rate_min = 5512,
+		.rate_max = 192000,
 		.formats = KIRKWOOD_I2S_FORMATS,
 		.formats = KIRKWOOD_I2S_FORMATS,
 	},
 	},
 	.capture = {
 	.capture = {
 		.channels_min = 1,
 		.channels_min = 1,
 		.channels_max = 2,
 		.channels_max = 2,
-		.rates = SNDRV_PCM_RATE_8000_192000 |
-			 SNDRV_PCM_RATE_CONTINUOUS |
-			 SNDRV_PCM_RATE_KNOT,
+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
+		.rate_min = 5512,
+		.rate_max = 192000,
 		.formats = KIRKWOOD_I2S_FORMATS,
 		.formats = KIRKWOOD_I2S_FORMATS,
 	},
 	},
 	.ops = &kirkwood_i2s_dai_ops,
 	.ops = &kirkwood_i2s_dai_ops,
@@ -494,17 +494,17 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk[2] = {
 	.playback = {
 	.playback = {
 		.channels_min = 1,
 		.channels_min = 1,
 		.channels_max = 2,
 		.channels_max = 2,
-		.rates = SNDRV_PCM_RATE_8000_192000 |
-			 SNDRV_PCM_RATE_CONTINUOUS |
-			 SNDRV_PCM_RATE_KNOT,
+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
+		.rate_min = 5512,
+		.rate_max = 192000,
 		.formats = KIRKWOOD_SPDIF_FORMATS,
 		.formats = KIRKWOOD_SPDIF_FORMATS,
 	},
 	},
 	.capture = {
 	.capture = {
 		.channels_min = 1,
 		.channels_min = 1,
 		.channels_max = 2,
 		.channels_max = 2,
-		.rates = SNDRV_PCM_RATE_8000_192000 |
-			 SNDRV_PCM_RATE_CONTINUOUS |
-			 SNDRV_PCM_RATE_KNOT,
+		.rates = SNDRV_PCM_RATE_CONTINUOUS,
+		.rate_min = 5512,
+		.rate_max = 192000,
 		.formats = KIRKWOOD_SPDIF_FORMATS,
 		.formats = KIRKWOOD_SPDIF_FORMATS,
 	},
 	},
 	.ops = &kirkwood_i2s_dai_ops,
 	.ops = &kirkwood_i2s_dai_ops,