mbox series

[0/2] ASoC: rsnd: Fixes for multichannel HDMI audio output

Message ID 20200415141017.384017-1-matthias.blankertz@cetitec.com (mailing list archive)
Headers show
Series ASoC: rsnd: Fixes for multichannel HDMI audio output | expand

Message

Matthias Blankertz April 15, 2020, 2:10 p.m. UTC
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

Comments

Kuninori Morimoto April 16, 2020, 1:35 a.m. UTC | #1
Hi

> 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(-)

For all patches

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thank you for your help !!

Best regards
---
Kuninori Morimoto
Mark Brown April 17, 2020, 4:15 p.m. UTC | #2
On Wed, 15 Apr 2020 16:10:15 +0200, Matthias Blankertz wrote:
> 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:
> 
> [...]

Applied, thanks!

[1/2] ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode
      commit: a09fb3f28a60ba3e928a1fa94b0456780800299d
[2/2] ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode
      commit: b94e164759b82d0c1c80d4b1c8f12c9bee83f11d

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark