aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2018-09-04 00:40:46 -0400
committerMaxime Ripard <maxime.ripard@bootlin.com>2018-09-05 03:18:34 -0400
commit06f27fe9ffb7efd9902c134f1e5ceb3861a1cefd (patch)
tree2b4a64c4ee3bf8f58eb4287593d6fa4c6267c3bd /drivers/gpu/drm
parent69517c1798f31232f91d9b4f3d07540f9aea6a07 (diff)
drm/sun4i: Add support for A64 mixers
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
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/sun4i/sun8i_mixer.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index fc3713608f78..8b3d02b146b7 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -569,6 +569,22 @@ static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = {
569 .mod_rate = 150000000, 569 .mod_rate = 150000000,
570}; 570};
571 571
572static const struct sun8i_mixer_cfg sun50i_a64_mixer0_cfg = {
573 .ccsc = 0,
574 .mod_rate = 297000000,
575 .scaler_mask = 0xf,
576 .ui_num = 3,
577 .vi_num = 1,
578};
579
580static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
581 .ccsc = 1,
582 .mod_rate = 297000000,
583 .scaler_mask = 0x3,
584 .ui_num = 1,
585 .vi_num = 1,
586};
587
572static const struct of_device_id sun8i_mixer_of_table[] = { 588static const struct of_device_id sun8i_mixer_of_table[] = {
573 { 589 {
574 .compatible = "allwinner,sun8i-a83t-de2-mixer-0", 590 .compatible = "allwinner,sun8i-a83t-de2-mixer-0",
@@ -594,6 +610,14 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
594 .compatible = "allwinner,sun8i-v3s-de2-mixer", 610 .compatible = "allwinner,sun8i-v3s-de2-mixer",
595 .data = &sun8i_v3s_mixer_cfg, 611 .data = &sun8i_v3s_mixer_cfg,
596 }, 612 },
613 {
614 .compatible = "allwinner,sun50i-a64-de2-mixer-0",
615 .data = &sun50i_a64_mixer0_cfg,
616 },
617 {
618 .compatible = "allwinner,sun50i-a64-de2-mixer-1",
619 .data = &sun50i_a64_mixer1_cfg,
620 },
597 { } 621 { }
598}; 622};
599MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table); 623MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);