diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:57 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:57 -0500 |
commit | 2f43a23ab9ea1865a663e100b0af20198decb4f1 (patch) | |
tree | 7501fb678115cbbdb544c43dc7b59f95408f1f52 /sound/soc/fsl | |
parent | 7cfa7b547337faf5890c8c5f091e081fb79caf73 (diff) | |
parent | 55dcdb5051930dee75e9e2c0da90bc82ee3dcd77 (diff) |
Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 3 | ||||
-rw-r--r-- | sound/soc/fsl/mpc5200_psc_i2s.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index b2ebaf811599..76e56b39db01 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c | |||
@@ -80,8 +80,7 @@ static inline void write_ssi_mask(u32 __iomem *addr, u32 clear, u32 set) | |||
80 | * ALSA that we support all rates and let the codec driver decide what rates | 80 | * ALSA that we support all rates and let the codec driver decide what rates |
81 | * are really supported. | 81 | * are really supported. |
82 | */ | 82 | */ |
83 | #define FSLSSI_I2S_RATES (SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_192000 | \ | 83 | #define FSLSSI_I2S_RATES SNDRV_PCM_RATE_CONTINUOUS |
84 | SNDRV_PCM_RATE_CONTINUOUS) | ||
85 | 84 | ||
86 | /** | 85 | /** |
87 | * FSLSSI_I2S_FORMATS: audio formats supported by the SSI | 86 | * FSLSSI_I2S_FORMATS: audio formats supported by the SSI |
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c index f4efaadb80a2..5d07e8a74a21 100644 --- a/sound/soc/fsl/mpc5200_psc_i2s.c +++ b/sound/soc/fsl/mpc5200_psc_i2s.c | |||
@@ -26,8 +26,7 @@ | |||
26 | * ALSA that we support all rates and let the codec driver decide what rates | 26 | * ALSA that we support all rates and let the codec driver decide what rates |
27 | * are really supported. | 27 | * are really supported. |
28 | */ | 28 | */ |
29 | #define PSC_I2S_RATES (SNDRV_PCM_RATE_5512 | SNDRV_PCM_RATE_8000_192000 | \ | 29 | #define PSC_I2S_RATES SNDRV_PCM_RATE_CONTINUOUS |
30 | SNDRV_PCM_RATE_CONTINUOUS) | ||
31 | 30 | ||
32 | /** | 31 | /** |
33 | * PSC_I2S_FORMATS: audio formats supported by the PSC I2S mode | 32 | * PSC_I2S_FORMATS: audio formats supported by the PSC I2S mode |