OSDN Git Service

drm/sun4i: Add support for A83T second DE2 mixer
authorJernej Skrabec <jernej.skrabec@siol.net>
Wed, 14 Feb 2018 20:09:03 +0000 (21:09 +0100)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Fri, 16 Feb 2018 08:35:32 +0000 (09:35 +0100)
It supports 1 VI and 1 UI plane and HW scaling on both planes.

Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180214200906.31509-10-jernej.skrabec@siol.net
drivers/gpu/drm/sun4i/sun8i_mixer.c

index 2cbb2de..9b0256d 100644 (file)
@@ -485,6 +485,13 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer0_cfg = {
        .vi_num         = 1,
 };
 
+static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {
+       .ccsc           = 1,
+       .scaler_mask    = 0x3,
+       .ui_num         = 1,
+       .vi_num         = 1,
+};
+
 static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
        .vi_num = 2,
        .ui_num = 1,
@@ -499,6 +506,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
                .data = &sun8i_a83t_mixer0_cfg,
        },
        {
+               .compatible = "allwinner,sun8i-a83t-de2-mixer-1",
+               .data = &sun8i_a83t_mixer1_cfg,
+       },
+       {
                .compatible = "allwinner,sun8i-v3s-de2-mixer",
                .data = &sun8i_v3s_mixer_cfg,
        },