]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/sun4i: Add support for H3 mixer 0
authorJernej Skrabec <jernej.skrabec@siol.net>
Thu, 1 Mar 2018 21:34:34 +0000 (22:34 +0100)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Fri, 2 Mar 2018 07:45:14 +0000 (08:45 +0100)
This mixer supports 1 VI plane, 3 UI plane and HW scaling on all planes.

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/20180301213442.16677-9-jernej.skrabec@siol.net
drivers/gpu/drm/sun4i/sun8i_mixer.c

index 9b0256d31a61ba8fc346af440032f9a578da6d79..126899d6f0d3a5942a00d2d4ed6ce26331520665 100644 (file)
@@ -492,6 +492,14 @@ static const struct sun8i_mixer_cfg sun8i_a83t_mixer1_cfg = {
        .vi_num         = 1,
 };
 
+static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = {
+       .ccsc           = 0,
+       .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,
@@ -509,6 +517,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
                .compatible = "allwinner,sun8i-a83t-de2-mixer-1",
                .data = &sun8i_a83t_mixer1_cfg,
        },
+       {
+               .compatible = "allwinner,sun8i-h3-de2-mixer-0",
+               .data = &sun8i_h3_mixer0_cfg,
+       },
        {
                .compatible = "allwinner,sun8i-v3s-de2-mixer",
                .data = &sun8i_v3s_mixer_cfg,