diff options
author | Dave Airlie <airlied@redhat.com> | 2023-11-06 11:24:29 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2023-11-06 11:24:30 +1000 |
commit | f056cb9681f631c99c7c6780c82651c86f15cf5c (patch) | |
tree | 0aa5cce564fdd40034ffb919a36af47614d79068 /Documentation | |
parent | 2ba446f82142d0d42fc5ea7bea7af581d33a7939 (diff) | |
parent | 94565e95e247c188fed4d3da1034402f3fb297de (diff) |
Merge tag 'drm-misc-next-fixes-2023-11-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next-fixes for v6.7-rc1:
- dt binding fix for ssd132x
- Initialize ssd130x crtc_state to NULL.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/58f40043-bb8a-4716-bf07-89f6a9f56c4c@linux.intel.com
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/display/solomon,ssd132x.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml index 0aa41bd9ddca..37975ee61c5a 100644 --- a/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml +++ b/Documentation/devicetree/bindings/display/solomon,ssd132x.yaml @@ -11,10 +11,10 @@ maintainers: properties: compatible: - - enum: - - solomon,ssd1322 - - solomon,ssd1325 - - solomon,ssd1327 + enum: + - solomon,ssd1322 + - solomon,ssd1325 + - solomon,ssd1327 required: - compatible |