]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm: sun4i: de33: mixer: add mixer configuration for the H616
authorJernej Skrabec <jernej.skrabec@gmail.com>
Wed, 28 May 2025 09:22:13 +0000 (21:22 +1200)
committerMaxime Ripard <mripard@kernel.org>
Mon, 2 Jun 2025 07:59:10 +0000 (09:59 +0200)
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.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Link: https://lore.kernel.org/r/20250528092431.28825-9-ryan@testtoast.com
Signed-off-by: Maxime Ripard <mripard@kernel.org>
drivers/gpu/drm/sun4i/sun8i_mixer.c

index 13e712382010e9bfebd9eaaf5cc304d43409848e..31a8409b98f4411dcf18b22dbc477f14f6e29ffd 100644 (file)
@@ -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);