armbian_build/patch/kernel/sunxi-dev/general-add-h3-mixer1.patch
Karabek 2525b74686
added H3-mixer1 and HDMI sound nodes
added general-add-H3-mixer1.patch		replacing unresolved/02-add-H3-mixers.patch 
mixer0 was been added upstream

added general-add-HDMI-sound-nodes-DT	replacing unresolved/00-20-add-HDMI-sound-nodes
removing the following kernel error messages:
[   10.831855] sun4i-codec 1c22c00.codec: ASoC: codec-analog@1f015c0 not registered
[   10.831884] sun4i-codec 1c22c00.codec: Failed to register our card
2018-05-31 14:17:56 +02:00

31 lines
859 B
Diff

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 126899d..7fa7494 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -500,6 +500,14 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
.vi_num = 1,
};
+static const struct sun8i_mixer_cfg sun8i_h3_mixer1_cfg = {
+ .ccsc = 1,
+ .mod_rate = 432000000,
+ .scaler_mask = 0xf,
+ .ui_num = 3,
+ .vi_num = 1,
+};
+
static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
.vi_num = 2,
.ui_num = 1,
@@ -522,6 +530,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
.data = &sun8i_h3_mixer0_cfg,
},
{
+ .compatible = "allwinner,sun8i-h3-de2-mixer-1",
+ .data = &sun8i_h3_mixer1_cfg,
+ },
+ {
.compatible = "allwinner,sun8i-v3s-de2-mixer",
.data = &sun8i_v3s_mixer_cfg,
},