mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 07:11:26 +00:00
a57ce78b37
* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
30 lines
859 B
Diff
30 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,
|
|
},
|