Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,10 @@
status = "disabled";
};

&spdif_tx3 {
status = "disabled";
};

&uart6 {
status = "okay";
};
13 changes: 12 additions & 1 deletion sound/soc/codecs/hdmi-codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -1110,11 +1110,22 @@ static int hdmi_codec_probe(struct platform_device *pdev)
if (hcd->i2s) {
daidrv[i] = hdmi_i2s_dai;
daidrv[i].playback.channels_max = hcd->max_i2s_channels;
/* Disable capture for HDMI-TX (output only) to prevent
* PulseAudio from trying to open capture streams which
* causes "Only one simultaneous stream supported!" errors
* and results in mono audio output.
*/
daidrv[i].capture.channels_min = 0;
daidrv[i].capture.channels_max = 0;
i++;
}

if (hcd->spdif)
if (hcd->spdif) {
daidrv[i] = hdmi_spdif_dai;
/* Disable capture for HDMI-TX SPDIF (output only) */
daidrv[i].capture.channels_min = 0;
daidrv[i].capture.channels_max = 0;
}

dev_set_drvdata(dev, hcp);

Expand Down
Loading