Commit e245db7b authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

 into drm-next

Mediatek DRM Next for Linux 6.5

1. Add display binding document for MT6795

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

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230614225803.2547-1-chunkuang.hu@kernel.org
parents 8e04cddf 4080a0e7

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

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

          - enum:

              - mediatek,mt2712-disp-aal

              - mediatek,mt6795-disp-aal

          - const: mediatek,mt8173-disp-aal

      - items:

          - enum:

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
          - const: mediatek,mt2701-disp-color

      - items:

          - enum:

              - mediatek,mt6795-disp-color

              - mediatek,mt8183-disp-color

              - mediatek,mt8186-disp-color

              - mediatek,mt8188-disp-color

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

+14 −9
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ description: | 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - mediatek,mt2701-dpi

          - mediatek,mt7623-dpi

          - mediatek,mt8173-dpi
@@ -26,6 +27,10 @@ properties: 
          - mediatek,mt8188-dp-intf

          - mediatek,mt8192-dpi

          - mediatek,mt8195-dp-intf

      - items:

          - enum:

              - mediatek,mt6795-dpi

          - const: mediatek,mt8183-dpi



  reg:

    maxItems: 1

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

+12 −7
Original line number Diff line number Diff line
@@ -22,13 +22,18 @@ allOf: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - mediatek,mt2701-dsi

          - mediatek,mt7623-dsi

          - mediatek,mt8167-dsi

          - mediatek,mt8173-dsi

          - mediatek,mt8183-dsi

          - mediatek,mt8186-dsi

      - items:

          - enum:

              - mediatek,mt6795-dsi

          - const: mediatek,mt8173-dsi



  reg:

    maxItems: 1

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

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ properties: 
      - enum:

          - mediatek,mt8173-disp-gamma

          - mediatek,mt8183-disp-gamma

      - items:

          - enum:

              - mediatek,mt6795-disp-gamma

          - const: mediatek,mt8173-disp-gamma

      - items:

          - enum:

              - mediatek,mt8186-disp-gamma