diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-02-21 12:30:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-02-21 12:31:16 +1000 |
| commit | c1368b347fe81d9271412797fea8788dd5dc16b3 (patch) | |
| tree | 22b7065a43062f3665b2e746a8a42cc2512972bb /Documentation | |
| parent | 7c42545cad101fbb9811b55a3b9b697efba6555a (diff) | |
| parent | dde2bb2da01e96c17f0a44b4a3cf72a30e66e3ef (diff) | |
| download | linux-c1368b347fe81d9271412797fea8788dd5dc16b3.tar.bz2 | |
Merge tag 'drm-misc-fixes-2020-02-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.6-rc3:
- Fix dt binding for sunxi.
- Allow only 1 rotation argument, and allow 0 rotation in video cmdline.
- Small compiler warning fix for panfrost.
- Fix when using performance counters in panfrost when using per fd address space.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f5a6370d-9898-6c72-43e4-5bb56a99b6f2@linux.intel.com
Diffstat (limited to 'Documentation')
| -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 86ad617d2327..5ff9cf26ca38 100644 --- a/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml +++ b/Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml @@ -43,9 +43,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 |