aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-10-19 23:43:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-12 06:41:15 -0400
commit666d5f34d8972d1d159b9f79f56620b6e817cc8a (patch)
treee30ab20d3716af60e8a76bef77aad35528461a74 /Documentation
parent6af7e1cae4457f5a17df46ca73d2f9b13d14edaf (diff)
drm/sun4i: Add compatible string for A31/A31s TCON (timing controller)
commit 93a5ec14da24a8abbac5bcb953b45cc7a5d0198a upstream. The A31 TCON has mux controls for how TCON outputs are routed to the HDMI and MIPI DSI blocks. Since the A31s does not have MIPI DSI, it only has a mux for the HDMI controller input. This patch only adds support for the compatible strings. Actual support for the mux controls should be added with HDMI and MIPI DSI support. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
index dfcfc38dc40b..4f7ae7555758 100644
--- a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
+++ b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
@@ -28,6 +28,8 @@ The TCON acts as a timing controller for RGB, LVDS and TV interfaces.
28Required properties: 28Required properties:
29 - compatible: value must be either: 29 - compatible: value must be either:
30 * allwinner,sun5i-a13-tcon 30 * allwinner,sun5i-a13-tcon
31 * allwinner,sun6i-a31-tcon
32 * allwinner,sun6i-a31s-tcon
31 * allwinner,sun8i-a33-tcon 33 * allwinner,sun8i-a33-tcon
32 - reg: base address and size of memory-mapped region 34 - reg: base address and size of memory-mapped region
33 - interrupts: interrupt associated to this IP 35 - interrupts: interrupt associated to this IP
@@ -50,7 +52,7 @@ Required properties:
50 second the block connected to the TCON channel 1 (usually the TV 52 second the block connected to the TCON channel 1 (usually the TV
51 encoder) 53 encoder)
52 54
53On the A13, there is one more clock required: 55On SoCs other than the A33, there is one more clock required:
54 - 'tcon-ch1': The clock driving the TCON channel 1 56 - 'tcon-ch1': The clock driving the TCON channel 1
55 57
56DRC 58DRC