drm/bridge: dw-hdmi-i2s: enable lpcm multi channels

Properly setup the channel count and layout in dw-hdmi i2s driver so
we are not limited to 2 channels.

Also correct the maximum channel reported by the DAI from 6 to 8 ch

Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190812120726.1528-5-jbrunet@baylibre.com

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
index 2b624cff541d7a546274717b77dee932756909e6..caf8aed78fea29beea96b3d68c94abdf45d599c6 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
@@ -84,6 +84,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
        }
 
        dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate);
+       dw_hdmi_set_channel_count(hdmi, hparms->channels);
 
        hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS);
        hdmi_write(audio, conf0, HDMI_AUD_CONF0);
@@ -139,7 +140,7 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev)
 
        pdata.ops               = &dw_hdmi_i2s_ops;
        pdata.i2s               = 1;
-       pdata.max_i2s_channels  = 6;
+       pdata.max_i2s_channels  = 8;
        pdata.data              = audio;
 
        memset(&pdevinfo, 0, sizeof(pdevinfo));