aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/video/renesas,du.txt12
-rw-r--r--drivers/gpu/drm/rcar-du/rcar_du_drv.c4
2 files changed, 10 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/video/renesas,du.txt b/Documentation/devicetree/bindings/video/renesas,du.txt
index c902323928f7..d05be121486f 100644
--- a/Documentation/devicetree/bindings/video/renesas,du.txt
+++ b/Documentation/devicetree/bindings/video/renesas,du.txt
@@ -5,7 +5,8 @@ Required Properties:
5 - compatible: must be one of the following. 5 - compatible: must be one of the following.
6 - "renesas,du-r8a7779" for R8A7779 (R-Car H1) compatible DU 6 - "renesas,du-r8a7779" for R8A7779 (R-Car H1) compatible DU
7 - "renesas,du-r8a7790" for R8A7790 (R-Car H2) compatible DU 7 - "renesas,du-r8a7790" for R8A7790 (R-Car H2) compatible DU
8 - "renesas,du-r8a7791" for R8A7791 (R-Car M2) compatible DU 8 - "renesas,du-r8a7791" for R8A7791 (R-Car M2-W) compatible DU
9 - "renesas,du-r8a7793" for R8A7793 (R-Car M2-N) compatible DU
9 10
10 - reg: A list of base address and length of each memory resource, one for 11 - reg: A list of base address and length of each memory resource, one for
11 each entry in the reg-names property. 12 each entry in the reg-names property.
@@ -22,9 +23,9 @@ Required Properties:
22 - clock-names: Name of the clocks. This property is model-dependent. 23 - clock-names: Name of the clocks. This property is model-dependent.
23 - R8A7779 uses a single functional clock. The clock doesn't need to be 24 - R8A7779 uses a single functional clock. The clock doesn't need to be
24 named. 25 named.
25 - R8A7790 and R8A7791 use one functional clock per channel and one clock 26 - R8A779[013] use one functional clock per channel and one clock per LVDS
26 per LVDS encoder. The functional clocks must be named "du.x" with "x" 27 encoder (if available). The functional clocks must be named "du.x" with
27 being the channel numerical index. The LVDS clocks must be named 28 "x" being the channel numerical index. The LVDS clocks must be named
28 "lvds.x" with "x" being the LVDS encoder numerical index. 29 "lvds.x" with "x" being the LVDS encoder numerical index.
29 - In addition to the functional and encoder clocks, all DU versions also 30 - In addition to the functional and encoder clocks, all DU versions also
30 support externally supplied pixel clocks. Those clocks are optional. 31 support externally supplied pixel clocks. Those clocks are optional.
@@ -43,7 +44,8 @@ corresponding to each DU output.
43----------------------------------------------------------------------------- 44-----------------------------------------------------------------------------
44 R8A7779 (H1) DPAD 0 DPAD 1 - 45 R8A7779 (H1) DPAD 0 DPAD 1 -
45 R8A7790 (H2) DPAD LVDS 0 LVDS 1 46 R8A7790 (H2) DPAD LVDS 0 LVDS 1
46 R8A7791 (M2) DPAD LVDS 0 - 47 R8A7791 (M2-W) DPAD LVDS 0 -
48 R8A7793 (M2-N) DPAD LVDS 0 -
47 49
48 50
49Example: R8A7790 (R-Car H2) DU 51Example: R8A7790 (R-Car H2) DU
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index bebcc97db5e5..d8e1fd93908f 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -84,12 +84,13 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = {
84 .num_lvds = 2, 84 .num_lvds = 2,
85}; 85};
86 86
87/* M2-W (r8a7791) and M2-N (r8a7793) are identical */
87static const struct rcar_du_device_info rcar_du_r8a7791_info = { 88static const struct rcar_du_device_info rcar_du_r8a7791_info = {
88 .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK 89 .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
89 | RCAR_DU_FEATURE_EXT_CTRL_REGS, 90 | RCAR_DU_FEATURE_EXT_CTRL_REGS,
90 .num_crtcs = 2, 91 .num_crtcs = 2,
91 .routes = { 92 .routes = {
92 /* R8A7791 has one RGB output, one LVDS output and one 93 /* R8A779[13] has one RGB output, one LVDS output and one
93 * (currently unsupported) TCON output. 94 * (currently unsupported) TCON output.
94 */ 95 */
95 [RCAR_DU_OUTPUT_DPAD0] = { 96 [RCAR_DU_OUTPUT_DPAD0] = {
@@ -110,6 +111,7 @@ static const struct of_device_id rcar_du_of_table[] = {
110 { .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info }, 111 { .compatible = "renesas,du-r8a7779", .data = &rcar_du_r8a7779_info },
111 { .compatible = "renesas,du-r8a7790", .data = &rcar_du_r8a7790_info }, 112 { .compatible = "renesas,du-r8a7790", .data = &rcar_du_r8a7790_info },
112 { .compatible = "renesas,du-r8a7791", .data = &rcar_du_r8a7791_info }, 113 { .compatible = "renesas,du-r8a7791", .data = &rcar_du_r8a7791_info },
114 { .compatible = "renesas,du-r8a7793", .data = &rcar_du_r8a7791_info },
113 { } 115 { }
114}; 116};
115 117