mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
29 lines
959 B
Diff
29 lines
959 B
Diff
|
From 283d3a9e253d2cefd915ee7f891c24edc3e6d6d0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Viorel Suman <viorel.suman@nxp.com>
|
||
|
|
Date: Tue, 24 Oct 2017 13:09:27 +0300
|
||
|
|
Subject: [PATCH] MLK-13946-8: ASoC: fsl_sai: use min(channels,slots) for xMR
|
||
|
|
setting
|
||
|
|
|
||
|
|
xMR setting must be set as min(channels,slots) since
|
||
|
|
both "channels < slots" and "channels > slots" scenarios
|
||
|
|
are possible.
|
||
|
|
|
||
|
|
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
|
||
|
|
---
|
||
|
|
sound/soc/fsl/fsl_sai.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/sound/soc/fsl/fsl_sai.c
|
||
|
|
+++ b/sound/soc/fsl/fsl_sai.c
|
||
|
|
@@ -571,8 +571,8 @@ static int fsl_sai_hw_params(struct snd_
|
||
|
|
regmap_update_bits(sai->regmap, FSL_SAI_xCR5(tx, offset),
|
||
|
|
FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK |
|
||
|
|
FSL_SAI_CR5_FBT_MASK, val_cr5);
|
||
|
|
- regmap_write(sai->regmap, FSL_SAI_xMR(tx), ~0UL - ((1 << slots) - 1));
|
||
|
|
-
|
||
|
|
+ regmap_write(sai->regmap, FSL_SAI_xMR(tx),
|
||
|
|
+ ~0UL - ((1 << min(channels, slots)) - 1));
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|