Commit 0d270f0d authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-next

Mediatek DRM Next - 20260325

1. mtk_dsi: enable hs clock during pre-enable
2. Remove all conflicting aperture devices during probe
3. Add support for mt8167 display blocks

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patch.msgid.link/20260325160721.4891-1-chunkuang.hu@kernel.org
parents cf2d1b5b e1c3bc32

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
          - enum:

              - mediatek,mt2712-disp-aal

              - mediatek,mt6795-disp-aal

              - mediatek,mt8167-disp-aal

          - const: mediatek,mt8173-disp-aal

      - items:

          - enum:

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

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ properties: 
          - mediatek,mt8183-disp-ccorr

          - mediatek,mt8192-disp-ccorr

      - items:

          - const: mediatek,mt8365-disp-ccorr

          - enum:

              - mediatek,mt8167-disp-ccorr

              - mediatek,mt8365-disp-ccorr

          - const: mediatek,mt8183-disp-ccorr

      - items:

          - enum:

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
          - mediatek,mt8183-disp-dither

      - items:

          - enum:

              - mediatek,mt8167-disp-dither

              - mediatek,mt8186-disp-dither

              - mediatek,mt8188-disp-dither

              - mediatek,mt8192-disp-dither

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ properties: 
      - items:

          - enum:

              - mediatek,mt6795-disp-gamma

              - mediatek,mt8167-disp-gamma

          - const: mediatek,mt8173-disp-gamma

      - items:

          - enum:

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

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
    oneOf:

      - enum:

          - mediatek,mt2701-disp-ovl

          - mediatek,mt8167-disp-ovl

          - mediatek,mt8173-disp-ovl

          - mediatek,mt8183-disp-ovl

          - mediatek,mt8192-disp-ovl