From: Jernej Skrabec <jernej.skra...@gmail.com>

The H616 (and related SoC packages sharing the same die) carry the new
DE33 display engine.

Add the mixer configuration and a compatible string for the H616 to the
mixer.

Signed-off-by: Jernej Skrabec <jernej.skra...@gmail.com>
Signed-off-by: Ryan Walklin <r...@testtoast.com>

--
Changelog v7..v8:
- Separate DE33 support and H616 enablement in the mixer.
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c 
b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 0bfd4b28b283..c9211a173a13 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -799,6 +799,17 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = 
{
        .vi_num         = 1,
 };
 
+static const struct sun8i_mixer_cfg sun50i_h616_mixer0_cfg = {
+       .ccsc           = CCSC_MIXER0_LAYOUT,
+       .de_type        = sun8i_mixer_de33,
+       .mod_rate       = 600000000,
+       .scaler_mask    = 0xf,
+       .scanline_yuv   = 4096,
+       .ui_num         = 3,
+       .vi_num         = 1,
+       .map            = {0, 6, 7, 8},
+};
+
 static const struct of_device_id sun8i_mixer_of_table[] = {
        {
                .compatible = "allwinner,sun8i-a83t-de2-mixer-0",
@@ -844,6 +855,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
                .compatible = "allwinner,sun50i-h6-de3-mixer-0",
                .data = &sun50i_h6_mixer0_cfg,
        },
+       {
+               .compatible = "allwinner,sun50i-h616-de33-mixer-0",
+               .data = &sun50i_h616_mixer0_cfg,
+       },
        { }
 };
 MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);
-- 
2.48.1

Reply via email to