744ea89a58
* Bumping EDGE kernel to 5.14.y Meson64: - removing Odroid reboot shutdown patch since its probably not needed anymore Rockchip64: - removing Rockpi S. No interest to maintain this any further - removing PBP suspend. Doesn’t align. Need inspection if some other way was mainstreamed - temporally removing Orangepi R1 * Re-adding rockpis, pbp suspend, HFLPS170 wifi and cleanup * Removing deprecated patch, fixing ap6256 wifi * Re-enable Opi R1 plus, untest * Add and fix Radxa Zero
31 lines
859 B
Diff
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,
|
|
},
|