mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 09:11:49 +00:00
1: update meson 4K support patches: 2, HDMI i2s improvement patches: 3, update vdec patches: 4, update meson audio patches: 5, add meson crypto engine driver 6, remove disabled patches: 7 remove unknown patch or no need 8, remove merged patches: 9, remove unknown patches from khadas should be covered by patches set 2 10, rename patches for better grouping 11, update kernel config accordingly Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From e70cea224676f6d878ab8c297c441a5a18d2fa8f Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Mon, 5 Aug 2019 15:40:58 +0200
|
|
Subject: [PATCH 4/8] 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
|
|
|
|
Cc: Jonas Karlman <jonas@kwiboo.se>
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
---
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
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 2b624cff541d..caf8aed78fea 100644
|
|
--- 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));
|
|
--
|
|
2.20.1
|
|
|