From: Mark Brown Date: Thu, 16 Apr 2020 12:01:34 +0000 (+0100) Subject: Merge series "ASoC: rsnd: Fixes for multichannel HDMI audio output" from Matthias... X-Git-Tag: v5.10.7~2563^2~34^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15a5760cb8b6d5c1ebbf1d2e1f0b77380ab68a82;p=platform%2Fkernel%2Flinux-rpi.git Merge series "ASoC: rsnd: Fixes for multichannel HDMI audio output" from Matthias Blankertz : 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 --- 15a5760cb8b6d5c1ebbf1d2e1f0b77380ab68a82