diff options
author | Mark Brown <broonie@kernel.org> | 2020-04-16 13:01:34 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-04-16 13:01:34 +0100 |
commit | 15a5760cb8b6d5c1ebbf1d2e1f0b77380ab68a82 (patch) | |
tree | ed0a2c5c5daba3c18a3f5072eeaaba3a96bdf6ac /sound/soc/Makefile | |
parent | 326b509238171d37402dbe308e154cc234ed1960 (diff) | |
parent | b94e164759b82d0c1c80d4b1c8f12c9bee83f11d (diff) | |
download | linux-15a5760cb8b6d5c1ebbf1d2e1f0b77380ab68a82.tar.bz2 |
Merge series "ASoC: rsnd: Fixes for multichannel HDMI audio output" from Matthias Blankertz <matthias.blankertz@cetitec.com>:
This fixes two issues in the snd-soc-rcar driver blocking multichannel
HDMI audio out: The parent SSI in a multi-SSI configuration is not
correctly set up and started, and the SSI->HDMI channel mapping is
wrong.
With these patches, the following device tree snippet can be used on an
r8a7795-based platform (Salvator-X) to enable multichannel HDMI audio on
HDMI0:
rsnd_port1: port@1 {
rsnd_endpoint1: endpoint {
remote-endpoint = <&dw_hdmi0_snd_in>;
dai-format = "i2s";
bitclock-master = <&rsnd_endpoint1>;
frame-master = <&rsnd_endpoint1>;
playback = <&ssi0 &ssi1 &ssi2 &ssi9>;
};
};
With a capable receiver attached, all of 2ch (stereo), 6ch (e.g. 5.1)
and 8ch audio output should work.
Matthias Blankertz (2):
ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode
ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode
sound/soc/sh/rcar/ssi.c | 8 ++++----
sound/soc/sh/rcar/ssiu.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
base-commit: 7111951b8d4973bda27ff663f2cf18b663d15b48
--
2.26.0
Diffstat (limited to 'sound/soc/Makefile')
0 files changed, 0 insertions, 0 deletions