Commit 278a1576 authored Apr 15, 2020 by Matthias Blankertz Committed by Greg Kroah-Hartman May 10, 2020

ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode



[ Upstream commit b94e164759b82d0c1c80d4b1c8f12c9bee83f11d ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent c1bc2cba

sound/soc/sh/rcar/ssiu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
		i;

		for_each_rsnd_mod_array(i, pos, io, rsnd_ssi_array) {
		shift = (i * 4) + 16;
		shift = (i * 4) + 20;
		val = (val & ~(0xF << shift)) \|
		rsnd_mod_id(pos) << shift;
		}