projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: Merge up fixes from Linus' tree
[platform/kernel/linux-starfive.git]
/
sound
/
soc
/
codecs
/
es8316.c
diff --git
a/sound/soc/codecs/es8316.c
b/sound/soc/codecs/es8316.c
index
65e497b
..
a8f347f
100644
(file)
--- a/
sound/soc/codecs/es8316.c
+++ b/
sound/soc/codecs/es8316.c
@@
-27,9
+27,9
@@
* MCLK/LRCK ratios, but we also add ratio 400, which is commonly used on
* Intel Cherry Trail platforms (19.2MHz MCLK, 48kHz LRCK).
*/
* MCLK/LRCK ratios, but we also add ratio 400, which is commonly used on
* Intel Cherry Trail platforms (19.2MHz MCLK, 48kHz LRCK).
*/
-#define NR_SUPPORTED_MCLK_LRCK_RATIOS
6
+#define NR_SUPPORTED_MCLK_LRCK_RATIOS
ARRAY_SIZE(supported_mclk_lrck_ratios)
static const unsigned int supported_mclk_lrck_ratios[] = {
static const unsigned int supported_mclk_lrck_ratios[] = {
- 256, 384, 400, 512, 768, 1024
+ 256, 384, 400, 5
00, 5
12, 768, 1024
};
struct es8316_priv {
};
struct es8316_priv {
@@
-494,6
+494,7
@@
static int es8316_pcm_hw_params(struct snd_pcm_substream *substream,
bclk_divider /= 20;
break;
case SNDRV_PCM_FORMAT_S24_LE:
bclk_divider /= 20;
break;
case SNDRV_PCM_FORMAT_S24_LE:
+ case SNDRV_PCM_FORMAT_S24_3LE:
wordlen = ES8316_SERDATA2_LEN_24;
bclk_divider /= 24;
break;
wordlen = ES8316_SERDATA2_LEN_24;
bclk_divider /= 24;
break;