Commit e245db7b authored by Dave Airlie's avatar Dave Airlie

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
...@@ -27,6 +27,7 @@ properties: ...@@ -27,6 +27,7 @@ properties:
- items: - items:
- enum: - enum:
- mediatek,mt2712-disp-aal - mediatek,mt2712-disp-aal
- mediatek,mt6795-disp-aal
- const: mediatek,mt8173-disp-aal - const: mediatek,mt8173-disp-aal
- items: - items:
- enum: - enum:
......
...@@ -33,6 +33,7 @@ properties: ...@@ -33,6 +33,7 @@ properties:
- const: mediatek,mt2701-disp-color - const: mediatek,mt2701-disp-color
- items: - items:
- enum: - enum:
- mediatek,mt6795-disp-color
- mediatek,mt8183-disp-color - mediatek,mt8183-disp-color
- mediatek,mt8186-disp-color - mediatek,mt8186-disp-color
- mediatek,mt8188-disp-color - mediatek,mt8188-disp-color
......
...@@ -17,15 +17,20 @@ description: | ...@@ -17,15 +17,20 @@ description: |
properties: properties:
compatible: compatible:
enum: oneOf:
- mediatek,mt2701-dpi - enum:
- mediatek,mt7623-dpi - mediatek,mt2701-dpi
- mediatek,mt8173-dpi - mediatek,mt7623-dpi
- mediatek,mt8183-dpi - mediatek,mt8173-dpi
- mediatek,mt8186-dpi - mediatek,mt8183-dpi
- mediatek,mt8188-dp-intf - mediatek,mt8186-dpi
- mediatek,mt8192-dpi - mediatek,mt8188-dp-intf
- mediatek,mt8195-dp-intf - mediatek,mt8192-dpi
- mediatek,mt8195-dp-intf
- items:
- enum:
- mediatek,mt6795-dpi
- const: mediatek,mt8183-dpi
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -22,13 +22,18 @@ allOf: ...@@ -22,13 +22,18 @@ allOf:
properties: properties:
compatible: compatible:
enum: oneOf:
- mediatek,mt2701-dsi - enum:
- mediatek,mt7623-dsi - mediatek,mt2701-dsi
- mediatek,mt8167-dsi - mediatek,mt7623-dsi
- mediatek,mt8173-dsi - mediatek,mt8167-dsi
- mediatek,mt8183-dsi - mediatek,mt8173-dsi
- mediatek,mt8186-dsi - mediatek,mt8183-dsi
- mediatek,mt8186-dsi
- items:
- enum:
- mediatek,mt6795-dsi
- const: mediatek,mt8173-dsi
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -24,6 +24,10 @@ properties: ...@@ -24,6 +24,10 @@ properties:
- enum: - enum:
- mediatek,mt8173-disp-gamma - mediatek,mt8173-disp-gamma
- mediatek,mt8183-disp-gamma - mediatek,mt8183-disp-gamma
- items:
- enum:
- mediatek,mt6795-disp-gamma
- const: mediatek,mt8173-disp-gamma
- items: - items:
- enum: - enum:
- mediatek,mt8186-disp-gamma - mediatek,mt8186-disp-gamma
......
...@@ -24,6 +24,9 @@ properties: ...@@ -24,6 +24,9 @@ properties:
- enum: - enum:
- mediatek,mt8173-disp-merge - mediatek,mt8173-disp-merge
- mediatek,mt8195-disp-merge - mediatek,mt8195-disp-merge
- items:
- const: mediatek,mt6795-disp-merge
- const: mediatek,mt8173-disp-merge
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -24,6 +24,9 @@ properties: ...@@ -24,6 +24,9 @@ properties:
- enum: - enum:
- mediatek,mt2712-disp-od - mediatek,mt2712-disp-od
- mediatek,mt8173-disp-od - mediatek,mt8173-disp-od
- items:
- const: mediatek,mt6795-disp-od
- const: mediatek,mt8173-disp-od
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -31,6 +31,10 @@ properties: ...@@ -31,6 +31,10 @@ properties:
- mediatek,mt7623-disp-ovl - mediatek,mt7623-disp-ovl
- mediatek,mt2712-disp-ovl - mediatek,mt2712-disp-ovl
- const: mediatek,mt2701-disp-ovl - const: mediatek,mt2701-disp-ovl
- items:
- enum:
- mediatek,mt6795-disp-ovl
- const: mediatek,mt8173-disp-ovl
- items: - items:
- enum: - enum:
- mediatek,mt8188-disp-ovl - mediatek,mt8188-disp-ovl
......
...@@ -37,6 +37,10 @@ properties: ...@@ -37,6 +37,10 @@ properties:
- mediatek,mt7623-disp-rdma - mediatek,mt7623-disp-rdma
- mediatek,mt2712-disp-rdma - mediatek,mt2712-disp-rdma
- const: mediatek,mt2701-disp-rdma - const: mediatek,mt2701-disp-rdma
- items:
- enum:
- mediatek,mt6795-disp-rdma
- const: mediatek,mt8173-disp-rdma
- items: - items:
- enum: - enum:
- mediatek,mt8186-disp-rdma - mediatek,mt8186-disp-rdma
......
...@@ -23,6 +23,9 @@ properties: ...@@ -23,6 +23,9 @@ properties:
oneOf: oneOf:
- enum: - enum:
- mediatek,mt8173-disp-split - mediatek,mt8173-disp-split
- items:
- const: mediatek,mt6795-disp-split
- const: mediatek,mt8173-disp-split
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -24,6 +24,9 @@ properties: ...@@ -24,6 +24,9 @@ properties:
oneOf: oneOf:
- enum: - enum:
- mediatek,mt8173-disp-ufoe - mediatek,mt8173-disp-ufoe
- items:
- const: mediatek,mt6795-disp-ufoe
- const: mediatek,mt8173-disp-ufoe
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -23,6 +23,9 @@ properties: ...@@ -23,6 +23,9 @@ properties:
oneOf: oneOf:
- enum: - enum:
- mediatek,mt8173-disp-wdma - mediatek,mt8173-disp-wdma
- items:
- const: mediatek,mt6795-disp-wdma
- const: mediatek,mt8173-disp-wdma
reg: reg:
maxItems: 1 maxItems: 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment