Merge branch 'asoc-5.4' into asoc-next

2019-09-09 14:55:20 +01:00
parent 6652ddbb5d 6fa5963c37
commit bb83178611
272 changed files with 12125 additions and 6868 deletions
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2170,7 +2170,7 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params,

 static const unsigned int rates[] = {
 	5512, 8000, 11025, 16000, 22050, 32000, 44100,
-	48000, 64000, 88200, 96000, 176400, 192000
+	48000, 64000, 88200, 96000, 176400, 192000, 352800, 384000
 };

 const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = {