cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
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;
|
|
}
|
|
|