diff options
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun8i_mixer.c')
-rw-r--r-- | drivers/gpu/drm/sun4i/sun8i_mixer.c | 24 |
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 091f6cf40353..8b3d02b146b7 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c | |||
@@ -545,6 +545,22 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { | |||
545 | .vi_num = 1, | 545 | .vi_num = 1, |
546 | }; | 546 | }; |
547 | 547 | ||
548 | static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = { | ||
549 | .ccsc = 0, | ||
550 | .mod_rate = 297000000, | ||
551 | .scaler_mask = 0xf, | ||
552 | .ui_num = 3, | ||
553 | .vi_num = 1, | ||
554 | }; | ||
555 | |||
556 | static const struct sun8i_mixer_cfg sun8i_r40_mixer1_cfg = { | ||
557 | .ccsc = 1, | ||
558 | .mod_rate = 297000000, | ||
559 | .scaler_mask = 0x3, | ||
560 | .ui_num = 1, | ||
561 | .vi_num = 1, | ||
562 | }; | ||
563 | |||
548 | static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { | 564 | static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { |
549 | .vi_num = 2, | 565 | .vi_num = 2, |
550 | .ui_num = 1, | 566 | .ui_num = 1, |
@@ -583,6 +599,14 @@ static const struct of_device_id sun8i_mixer_of_table[] = { | |||
583 | .data = &sun8i_h3_mixer0_cfg, | 599 | .data = &sun8i_h3_mixer0_cfg, |
584 | }, | 600 | }, |
585 | { | 601 | { |
602 | .compatible = "allwinner,sun8i-r40-de2-mixer-0", | ||
603 | .data = &sun8i_r40_mixer0_cfg, | ||
604 | }, | ||
605 | { | ||
606 | .compatible = "allwinner,sun8i-r40-de2-mixer-1", | ||
607 | .data = &sun8i_r40_mixer1_cfg, | ||
608 | }, | ||
609 | { | ||
586 | .compatible = "allwinner,sun8i-v3s-de2-mixer", | 610 | .compatible = "allwinner,sun8i-v3s-de2-mixer", |
587 | .data = &sun8i_v3s_mixer_cfg, | 611 | .data = &sun8i_v3s_mixer_cfg, |
588 | }, | 612 | }, |