Commit 98bcaafd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-5.19' of... 

Merge tag 'mediatek-drm-next-5.19' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 5.19

1. Add display support for MT8186
2. Miscellaneous refinement and fixup.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1651702965-23630-1-git-send-email-chunkuang.hu@kernel.org
parents c67f84e9 b8b8eeda

Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml

+7 −4
Original line number Diff line number Diff line
@@ -21,16 +21,19 @@ description: | 
properties:

  compatible:

    oneOf:

      - enum:

          - mediatek,mt8173-disp-aal

          - mediatek,mt8183-disp-aal

      - items:

          - enum:

              - mediatek,mt2712-disp-aal

          - const: mediatek,mt8173-disp-aal

      - items:

          - enum:

              - mediatek,mt2712-disp-aal

              - mediatek,mt8183-disp-aal

              - mediatek,mt8186-disp-aal

              - mediatek,mt8192-disp-aal

              - mediatek,mt8195-disp-aal

          - enum:

              - mediatek,mt8173-disp-aal

          - const: mediatek,mt8183-disp-aal



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml

+4 −1
Original line number Diff line number Diff line
@@ -28,8 +28,11 @@ properties: 
      - items:

          - enum:

              - mediatek,mt8195-disp-ccorr

          - const: mediatek,mt8192-disp-ccorr

      - items:

          - enum:

              - mediatek,mt8192-disp-ccorr

              - mediatek,mt8186-disp-ccorr

          - const: mediatek,mt8183-disp-ccorr



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml

+3 −4
Original line number Diff line number Diff line
@@ -32,15 +32,14 @@ properties: 
          - enum:

              - mediatek,mt7623-disp-color

              - mediatek,mt2712-disp-color

          - enum:

              - mediatek,mt2701-disp-color

          - const: mediatek,mt2701-disp-color

      - items:

          - enum:

              - mediatek,mt8183-disp-color

              - mediatek,mt8186-disp-color

              - mediatek,mt8192-disp-color

              - mediatek,mt8195-disp-color

          - enum:

              - mediatek,mt8173-disp-color

          - const: mediatek,mt8173-disp-color

  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ properties: 
          - const: mediatek,mt8183-disp-dither

      - items:

          - enum:

              - mediatek,mt8186-disp-dither

              - mediatek,mt8192-disp-dither

              - mediatek,mt8195-disp-dither

          - enum:

              - mediatek,mt8183-disp-dither

          - const: mediatek,mt8183-disp-dither



  reg:

    maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
      - mediatek,mt7623-dpi

      - mediatek,mt8173-dpi

      - mediatek,mt8183-dpi

      - mediatek,mt8186-dpi

      - mediatek,mt8192-dpi



  reg: