diff options
author | Dave Airlie <airlied@redhat.com> | 2024-07-26 09:51:10 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2024-07-26 09:51:14 +1000 |
commit | 86f259cb7ca13a7b0a4b9314f01668118c2aba59 (patch) | |
tree | 701f3f04b34b05a3be31cd2aa81ac135518e4036 /Documentation/devicetree | |
parent | a37cd98cd56e2c53d77d9c45cd4b7b3d91916df7 (diff) | |
parent | b6f7d984ebf826069d3dc6fa187b4d1cfb90f965 (diff) | |
download | linux-stable-86f259cb7ca13a7b0a4b9314f01668118c2aba59.tar.gz linux-stable-86f259cb7ca13a7b0a4b9314f01668118c2aba59.tar.bz2 linux-stable-86f259cb7ca13a7b0a4b9314f01668118c2aba59.zip |
Merge tag 'drm-misc-next-fixes-2024-07-25' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next
A single fix for a panel compatible
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240725-frisky-wren-of-tact-f5f504@houat
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml b/Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml index 765ca155c83a..5192c93fbd67 100644 --- a/Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml +++ b/Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml @@ -14,7 +14,13 @@ allOf: properties: compatible: - const: samsung,atna33xc20 + oneOf: + # Samsung 13.3" FHD (1920x1080 pixels) eDP AMOLED panel + - const: samsung,atna33xc20 + # Samsung 14.5" WQXGA+ (2880x1800 pixels) eDP AMOLED panel + - items: + - const: samsung,atna45af01 + - const: samsung,atna33xc20 enable-gpios: true port: true |