diff options
author | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
commit | 51b8479ab20ba3804348824c63abdb3f35b0aaeb (patch) | |
tree | f3ecae09fc31773c9da185de167bf2034f1aaa2e /Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml | |
parent | 6afe6929964bca6847986d0507a555a041f07753 (diff) | |
parent | 69ddce0970d9d1de63bed9c24eefa0814db29a5a (diff) |
Merge drm/drm-next into drm-misc-next
Jernej needs some patches that got merged in -rc5.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml')
-rw-r--r-- | Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml index bbd500b024d3..e5344c4ae226 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml @@ -49,9 +49,13 @@ properties: - enum: - allwinner,sun8i-h3-tcon-tv - allwinner,sun50i-a64-tcon-tv - - allwinner,sun50i-h6-tcon-tv - const: allwinner,sun8i-a83t-tcon-tv + - items: + - enum: + - allwinner,sun50i-h6-tcon-tv + - const: allwinner,sun8i-r40-tcon-tv + reg: maxItems: 1 |