]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
ASoC: fsl_ssi: Fix TDM slot setup for I2S mode
authorAlexander Shiyan <shc_work@mail.ru>
Tue, 16 Feb 2021 11:42:21 +0000 (14:42 +0300)
committerSeth Forshee <seth.forshee@canonical.com>
Thu, 8 Apr 2021 20:42:11 +0000 (15:42 -0500)
commitfa71cb4e6f1ce931367ff99ae41f317a98769e69
tree200fc255181242b0e3e352bcc303075dee2d2deb
parent4ee7f119aed2c459eaa01cba25b5b3ce7cfb3e92
ASoC: fsl_ssi: Fix TDM slot setup for I2S mode

BugLink: https://bugs.launchpad.net/bugs/1921712
commit 87263968516fb9507d6215d53f44052627fae8d8 upstream.

When using the driver in I2S TDM mode, the _fsl_ssi_set_dai_fmt()
function rewrites the number of slots previously set by the
fsl_ssi_set_dai_tdm_slot() function to 2 by default.
To fix this, let's use the saved slot count value or, if TDM
is not used and the slot count is not set, proceed as before.

Fixes: 4f14f5c11db1 ("ASoC: fsl_ssi: Fix number of words per frame for I2S-slave mode")
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Link: https://lore.kernel.org/r/20210216114221.26635-1-shc_work@mail.ru
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
sound/soc/fsl/fsl_ssi.c