mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
7b0c873f4d
* sunxi-5.18: add megous patches: tag: orange-pi-5.18-20220627-1924 * tools: mk_format_patch: ignore-matching-lines git version * sunxi-5.18: re-extracted armbian patches after being applied to 5.18.8 * sunxi-5.18: switch to version tag=v5.18.8
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From e42108d31eefe1764093d4d37708d7cb1687e1a3 Mon Sep 17 00:00:00 2001
|
|
From: The-going <48602507+The-going@users.noreply.github.com>
|
|
Date: Tue, 1 Feb 2022 19:37:03 +0300
|
|
Subject: [PATCH 052/169] drv:gpu:drm:sun4i:sun8i_mixer.c add h3 mixer1
|
|
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_mixer.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
|
|
index 43aad118e..54936395a 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
|
|
@@ -616,6 +616,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_r40_mixer0_cfg = {
|
|
.ccsc = 0,
|
|
.mod_rate = 297000000,
|
|
@@ -684,6 +692,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
|
|
.compatible = "allwinner,sun8i-h3-de2-mixer-0",
|
|
.data = &sun8i_h3_mixer0_cfg,
|
|
},
|
|
+ {
|
|
+ .compatible = "allwinner,sun8i-h3-de2-mixer-1",
|
|
+ .data = &sun8i_h3_mixer1_cfg,
|
|
+ },
|
|
{
|
|
.compatible = "allwinner,sun8i-r40-de2-mixer-0",
|
|
.data = &sun8i_r40_mixer0_cfg,
|
|
--
|
|
2.35.3
|
|
|