drm/sun4i: Add support for A64 mixers
authorJagan Teki <jagan@amarulasolutions.com>
Tue, 4 Sep 2018 04:40:46 +0000 (12:40 +0800)
committerMaxime Ripard <maxime.ripard@bootlin.com>
Wed, 5 Sep 2018 07:18:34 +0000 (09:18 +0200)
Mixers in Allwinner have similar capabilities as others SoCs with DE2.

Add support for them.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
[Icenowy: Add mixer1]
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180904044053.15425-5-icenowy@aosc.io
drivers/gpu/drm/sun4i/sun8i_mixer.c

index fc3713608f78d9742bb0364f7d81f2e3db10bd55..8b3d02b146b7a57c5cfe6f25ef7dc83155339180 100644 (file)
@@ -569,6 +569,22 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
        .mod_rate = 150000000,
 };
 
+static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {
+       .ccsc           = 0,
+       .mod_rate       = 297000000,
+       .scaler_mask    = 0xf,
+       .ui_num         = 3,
+       .vi_num         = 1,
+};
+
+static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
+       .ccsc           = 1,
+       .mod_rate       = 297000000,
+       .scaler_mask    = 0x3,
+       .ui_num         = 1,
+       .vi_num         = 1,
+};
+
 static const struct of_device_id sun8i_mixer_of_table[] = {
        {
                .compatible = "allwinner,sun8i-a83t-de2-mixer-0",
@@ -594,6 +610,14 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
                .compatible = "allwinner,sun8i-v3s-de2-mixer",
                .data = &sun8i_v3s_mixer_cfg,
        },
+       {
+               .compatible = "allwinner,sun50i-a64-de2-mixer-0",
+               .data = &sun50i_a64_mixer0_cfg,
+       },
+       {
+               .compatible = "allwinner,sun50i-a64-de2-mixer-1",
+               .data = &sun50i_a64_mixer1_cfg,
+       },
        { }
 };
 MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);