]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode
authorMatthias Blankertz <matthias.blankertz@cetitec.com>
Wed, 15 Apr 2020 14:10:17 +0000 (16:10 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 16 Apr 2020 11:44:59 +0000 (12:44 +0100)
commit5635dbf2ac3d2dab1bd741f5879f048147a5fb96
treecb729a5457001794b55a7c26e1c63ba4382d7ec1
parent68bfbe589c6d81d699c3a2a41ba19599c4ce5f52
ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode

The HDMI?_SEL register maps up to four stereo SSI data lanes onto the
sdata[0..3] inputs of the HDMI output block. The upper half of the
register contains four blocks of 4 bits, with the most significant
controlling the sdata3 line and the least significant the sdata0 line.

The shift calculation has an off-by-one error, causing the parent SSI to
be mapped to sdata3, the first multi-SSI child to sdata0 and so forth.
As the parent SSI transmits the stereo L/R channels, and the HDMI core
expects it on the sdata0 line, this causes no audio to be output when
playing stereo audio on a multichannel capable HDMI out, and
multichannel audio has permutated channels.

Fix the shift calculation to map the parent SSI to sdata0, the first
child to sdata1 etc.

Signed-off-by: Matthias Blankertz <matthias.blankertz@cetitec.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20200415141017.384017-3-matthias.blankertz@cetitec.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/ssiu.c