v10: 1. Rebase to 5.18-rc1 2. Drop "dt-bindings: display: mediatek: add aal binding for MT8183". I will move it to another series.
v9: 1. Revise [1/5] dt-bindings: display: mediatek: add aal binding for MT8183.
v8: 1. Revise [1/5] dt-bindings: display: mediatek: add aal binding for MT8183.
v7: 1. Rebase to chunkuang.hu/linux.git mediatek-drm-fixes
v6: 1. Remove mmsys patches which are accepted. 2. Fix error of dt-binding.
v5: 1. Add binding patch of aal for MT8183. 2. Revise enum to const. 3. Change to use enum for mutex. 4. Remove patches which are accepted by maintainers. (mmsys and mutex)
v4: 1. Remove binding of dsi and dpi. 2. Revise aal binding. 3. Fix indention in [4/5].
v3: 1. Modify display binding based on mtk display binding patch. ([1]) 2. Remove patch: drm/mediatek: separate postmask component from mtk_disp_drv.c 3. Remove compatible of 8186 ovl because we can re-use compatible of 8192 for 8186. 4. Fix issue of space before tab on mutex patch.
[1]: repo: chunkuang.hu/linux.git, branch: mediatek-drm-next, id: 4ed545e7d10049b5492afc184e61a67e478a2cfd
v2: 1. Add binding documentation for mmsys, mutex and mtk_display. 2. Remove duplicated definition of postmask registers on mtk_drm_drv. 3. Add disp_ovl support for MT8186. 4. Add detailed commit messages.
Rex-BC Chen (3): dt-bindings: display: mediatek: revise enum to const dt-bindings: display: mediatek: change to use enum for mutex dt-bindings: display: mediatek: add MT8186 SoC binding
Yongqiang Niu (1): drm/mediatek: add display support for MT8186
.../display/mediatek/mediatek,aal.yaml | 5 ++- .../display/mediatek/mediatek,ccorr.yaml | 5 ++- .../display/mediatek/mediatek,color.yaml | 7 ++-- .../display/mediatek/mediatek,dither.yaml | 4 +-- .../display/mediatek/mediatek,gamma.yaml | 4 +-- .../display/mediatek/mediatek,mutex.yaml | 25 ++++++-------- .../display/mediatek/mediatek,ovl-2l.yaml | 4 +++ .../display/mediatek/mediatek,ovl.yaml | 8 +++-- .../display/mediatek/mediatek,postmask.yaml | 4 +++ .../display/mediatek/mediatek,rdma.yaml | 7 ++-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 +++++++++++++++++++ 11 files changed, 74 insertions(+), 32 deletions(-)
There won't be more than 1 fallback for these bindings, so we modify them to use const instead of enum.
Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com Reviewed-by: Rob Herring robh@kernel.org Reviewed-by: AngeloGioacchino Del Regno angelogioacchino.delregno@collabora.com --- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 3 +-- .../bindings/display/mediatek/mediatek,ccorr.yaml | 3 +-- .../bindings/display/mediatek/mediatek,color.yaml | 6 ++---- .../bindings/display/mediatek/mediatek,dither.yaml | 3 +-- .../bindings/display/mediatek/mediatek,gamma.yaml | 3 +-- .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 6 ++---- .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml | 6 ++---- 7 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml index 61f0ed1e388f..cdb6d0819cca 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml @@ -29,8 +29,7 @@ properties: - mediatek,mt8183-disp-aal - mediatek,mt8192-disp-aal - mediatek,mt8195-disp-aal - - enum: - - mediatek,mt8173-disp-aal + - const: mediatek,mt8173-disp-aal
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml index 0ed53b6238f0..7766c806c102 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml @@ -28,8 +28,7 @@ properties: - items: - enum: - mediatek,mt8195-disp-ccorr - - enum: - - mediatek,mt8192-disp-ccorr + - const: mediatek,mt8192-disp-ccorr
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml index 3ad842eb5668..0c9095b0411e 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml @@ -32,15 +32,13 @@ 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,mt8192-disp-color - mediatek,mt8195-disp-color - - enum: - - mediatek,mt8173-disp-color + - const: mediatek,mt8173-disp-color reg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml index 6657549af165..8180ed0a89ff 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml @@ -28,8 +28,7 @@ properties: - enum: - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither - - enum: - - mediatek,mt8183-disp-dither + - const: mediatek,mt8183-disp-dither
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml index 78442339314f..5f1825b4512b 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml @@ -29,8 +29,7 @@ properties: - enum: - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - - enum: - - mediatek,mt8183-disp-gamma + - const: mediatek,mt8183-disp-gamma
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml index f77094e61443..51f8235f1b1b 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml @@ -33,13 +33,11 @@ properties: - enum: - mediatek,mt7623-disp-ovl - mediatek,mt2712-disp-ovl - - enum: - - mediatek,mt2701-disp-ovl + - const: mediatek,mt2701-disp-ovl - items: - enum: - mediatek,mt8195-disp-ovl - - enum: - - mediatek,mt8183-disp-ovl + - const: mediatek,mt8183-disp-ovl
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml index e8c72afa0630..9a6756f185ee 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml @@ -35,13 +35,11 @@ properties: - enum: - mediatek,mt7623-disp-rdma - mediatek,mt2712-disp-rdma - - enum: - - mediatek,mt2701-disp-rdma + - const: mediatek,mt2701-disp-rdma - items: - enum: - mediatek,mt8192-disp-rdma - - enum: - - mediatek,mt8183-disp-rdma + - const: mediatek,mt8183-disp-rdma
reg: maxItems: 1
Hi, Rex:
On Wed, 2022-04-06 at 11:00 +0800, Rex-BC Chen wrote:
There won't be more than 1 fallback for these bindings, so we modify them to use const instead of enum.
Reviewed-by: CK Hu ck.hu@mediatek.com
Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com Reviewed-by: Rob Herring robh@kernel.org Reviewed-by: AngeloGioacchino Del Regno < angelogioacchino.delregno@collabora.com>
.../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 3 +-- .../bindings/display/mediatek/mediatek,ccorr.yaml | 3 +-- .../bindings/display/mediatek/mediatek,color.yaml | 6 ++
.../bindings/display/mediatek/mediatek,dither.yaml | 3 +-- .../bindings/display/mediatek/mediatek,gamma.yaml | 3 +-- .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 6 ++
.../devicetree/bindings/display/mediatek/mediatek,rdma.yaml | 6 ++
7 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l index 61f0ed1e388f..cdb6d0819cca 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l @@ -29,8 +29,7 @@ properties: - mediatek,mt8183-disp-aal - mediatek,mt8192-disp-aal - mediatek,mt8195-disp-aal
- enum:- mediatek,mt8173-disp-aal
- const: mediatek,mt8173-disp-aalreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml index 0ed53b6238f0..7766c806c102 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml @@ -28,8 +28,7 @@ properties: - items: - enum: - mediatek,mt8195-disp-ccorr
- enum:- mediatek,mt8192-disp-ccorr
- const: mediatek,mt8192-disp-ccorrreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml index 3ad842eb5668..0c9095b0411e 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml @@ -32,15 +32,13 @@ 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,mt8192-disp-color - mediatek,mt8195-disp-color
- enum:- mediatek,mt8173-disp-color
- const: mediatek,mt8173-disp-colordiff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml index 6657549af165..8180ed0a89ff 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml @@ -28,8 +28,7 @@ properties: - enum: - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither
- enum:- mediatek,mt8183-disp-dither
- const: mediatek,mt8183-disp-ditherreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml index 78442339314f..5f1825b4512b 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml @@ -29,8 +29,7 @@ properties: - enum: - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma
- enum:- mediatek,mt8183-disp-gamma
- const: mediatek,mt8183-disp-gammareg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l index f77094e61443..51f8235f1b1b 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l @@ -33,13 +33,11 @@ properties: - enum: - mediatek,mt7623-disp-ovl - mediatek,mt2712-disp-ovl
- enum:- mediatek,mt2701-disp-ovl
- const: mediatek,mt2701-disp-ovl - items: - enum: - mediatek,mt8195-disp-ovl
- enum:- mediatek,mt8183-disp-ovl
- const: mediatek,mt8183-disp-ovlreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml index e8c72afa0630..9a6756f185ee 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml @@ -35,13 +35,11 @@ properties: - enum: - mediatek,mt7623-disp-rdma - mediatek,mt2712-disp-rdma
- enum:- mediatek,mt2701-disp-rdma
- const: mediatek,mt2701-disp-rdma - items: - enum: - mediatek,mt8192-disp-rdma
- enum:- mediatek,mt8183-disp-rdma
- const: mediatek,mt8183-disp-rdmareg: maxItems: 1
All single entry cases in mutex can be merged as a single enum.
Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com Reviewed-by: Rob Herring robh@kernel.org Reviewed-by: AngeloGioacchino Del Regno angelogioacchino.delregno@collabora.com --- .../display/mediatek/mediatek,mutex.yaml | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml index 00e6a1041a9b..b470fbb1b40a 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml @@ -23,21 +23,15 @@ description: |
properties: compatible: - oneOf: - - items: - - const: mediatek,mt2701-disp-mutex - - items: - - const: mediatek,mt2712-disp-mutex - - items: - - const: mediatek,mt8167-disp-mutex - - items: - - const: mediatek,mt8173-disp-mutex - - items: - - const: mediatek,mt8183-disp-mutex - - items: - - const: mediatek,mt8192-disp-mutex - - items: - - const: mediatek,mt8195-disp-mutex + enum: + - mediatek,mt2701-disp-mutex + - mediatek,mt2712-disp-mutex + - mediatek,mt8167-disp-mutex + - mediatek,mt8173-disp-mutex + - mediatek,mt8183-disp-mutex + - mediatek,mt8192-disp-mutex + - mediatek,mt8195-disp-mutex + reg: maxItems: 1
Hi, Rex:
On Wed, 2022-04-06 at 11:00 +0800, Rex-BC Chen wrote:
All single entry cases in mutex can be merged as a single enum.
Reviewed-by: CK Hu ck.hu@mediatek.com
Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com Reviewed-by: Rob Herring robh@kernel.org Reviewed-by: AngeloGioacchino Del Regno < angelogioacchino.delregno@collabora.com>
.../display/mediatek/mediatek,mutex.yaml | 24 +++++++--------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml index 00e6a1041a9b..b470fbb1b40a 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml @@ -23,21 +23,15 @@ description: |
properties: compatible:
- oneOf:
- items:- const: mediatek,mt2701-disp-mutex- items:- const: mediatek,mt2712-disp-mutex- items:- const: mediatek,mt8167-disp-mutex- items:- const: mediatek,mt8173-disp-mutex- items:- const: mediatek,mt8183-disp-mutex- items:- const: mediatek,mt8192-disp-mutex- items:- const: mediatek,mt8195-disp-mutex
- enum:
- mediatek,mt2701-disp-mutex- mediatek,mt2712-disp-mutex- mediatek,mt8167-disp-mutex- mediatek,mt8173-disp-mutex- mediatek,mt8183-disp-mutex- mediatek,mt8192-disp-mutex- mediatek,mt8195-disp-mutex- reg: maxItems: 1
Add MT8186 SoC binding to AAL, CCORR, COLOR, DITHER, GAMMA, MUTEX, OVL, POSTMASK and RDMA.
Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com Reviewed-by: Rob Herring robh@kernel.org Reviewed-by: AngeloGioacchino Del Regno angelogioacchino.delregno@collabora.com --- .../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,color.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,dither.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,mutex.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 4 ++++ .../bindings/display/mediatek/mediatek,postmask.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml | 1 + 10 files changed, 25 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml index cdb6d0819cca..cb4a2f39ff88 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yaml @@ -30,6 +30,10 @@ properties: - mediatek,mt8192-disp-aal - mediatek,mt8195-disp-aal - const: mediatek,mt8173-disp-aal + - items: + - enum: + - mediatek,mt8186-disp-aal + - const: mediatek,mt8183-disp-aal
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml index 7766c806c102..63fb02014a56 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml @@ -29,6 +29,10 @@ properties: - enum: - mediatek,mt8195-disp-ccorr - const: mediatek,mt8192-disp-ccorr + - items: + - enum: + - mediatek,mt8186-disp-ccorr + - const: mediatek,mt8183-disp-ccorr
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml index 0c9095b0411e..d2f89ee7996f 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.yaml @@ -36,6 +36,7 @@ properties: - items: - enum: - mediatek,mt8183-disp-color + - mediatek,mt8186-disp-color - mediatek,mt8192-disp-color - mediatek,mt8195-disp-color - const: mediatek,mt8173-disp-color diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml index 8180ed0a89ff..8ad8187c02d1 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither.yaml @@ -26,6 +26,7 @@ properties: - const: mediatek,mt8183-disp-dither - items: - enum: + - mediatek,mt8186-disp-dither - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither - const: mediatek,mt8183-disp-dither diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml index 5f1825b4512b..a89ea0ea7542 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml @@ -27,6 +27,7 @@ properties: - const: mediatek,mt8183-disp-gamma - items: - enum: + - mediatek,mt8186-disp-gamma - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - const: mediatek,mt8183-disp-gamma diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml index b470fbb1b40a..3fdad71210b4 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.yaml @@ -29,6 +29,7 @@ properties: - mediatek,mt8167-disp-mutex - mediatek,mt8173-disp-mutex - mediatek,mt8183-disp-mutex + - mediatek,mt8186-disp-mutex - mediatek,mt8192-disp-mutex - mediatek,mt8195-disp-mutex
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml index da999ba53b7c..4e94f4e947ad 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml @@ -25,6 +25,10 @@ properties: - const: mediatek,mt8183-disp-ovl-2l - items: - const: mediatek,mt8192-disp-ovl-2l + - items: + - enum: + - mediatek,mt8186-disp-ovl-2l + - const: mediatek,mt8192-disp-ovl-2l
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml index 51f8235f1b1b..a2a27d0ca038 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yaml @@ -38,6 +38,10 @@ properties: - enum: - mediatek,mt8195-disp-ovl - const: mediatek,mt8183-disp-ovl + - items: + - enum: + - mediatek,mt8186-disp-ovl + - const: mediatek,mt8192-disp-ovl
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml index 2d769422e29f..654080bfbdfb 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,postmask.yaml @@ -23,6 +23,10 @@ properties: oneOf: - items: - const: mediatek,mt8192-disp-postmask + - items: + - enum: + - mediatek,mt8186-disp-postmask + - const: mediatek,mt8192-disp-postmask
reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml index 9a6756f185ee..0882ae86e6c4 100644 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.yaml @@ -38,6 +38,7 @@ properties: - const: mediatek,mt2701-disp-rdma - items: - enum: + - mediatek,mt8186-disp-rdma - mediatek,mt8192-disp-rdma - const: mediatek,mt8183-disp-rdma
Hi, Rex:
On Wed, 2022-04-06 at 11:00 +0800, Rex-BC Chen wrote:
Add MT8186 SoC binding to AAL, CCORR, COLOR, DITHER, GAMMA, MUTEX, OVL, POSTMASK and RDMA.
Reviewed-by: CK Hu ck.hu@mediatek.com
Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com Reviewed-by: Rob Herring robh@kernel.org Reviewed-by: AngeloGioacchino Del Regno < angelogioacchino.delregno@collabora.com>
.../devicetree/bindings/display/mediatek/mediatek,aal.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,ccorr.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,color.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,dither.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,mutex.yaml | 1 + .../devicetree/bindings/display/mediatek/mediatek,ovl-2l.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,ovl.yaml | 4 ++++ .../bindings/display/mediatek/mediatek,postmask.yaml | 4 ++++ .../devicetree/bindings/display/mediatek/mediatek,rdma.yaml | 1 + 10 files changed, 25 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l index cdb6d0819cca..cb4a2f39ff88 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,aal.yam l @@ -30,6 +30,10 @@ properties: - mediatek,mt8192-disp-aal - mediatek,mt8195-disp-aal - const: mediatek,mt8173-disp-aal
- items:- enum:- mediatek,mt8186-disp-aal- const: mediatek,mt8183-disp-aalreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml index 7766c806c102..63fb02014a56 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.y aml @@ -29,6 +29,10 @@ properties: - enum: - mediatek,mt8195-disp-ccorr - const: mediatek,mt8192-disp-ccorr
- items:- enum:- mediatek,mt8186-disp-ccorr- const: mediatek,mt8183-disp-ccorrreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml index 0c9095b0411e..d2f89ee7996f 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,color.y aml @@ -36,6 +36,7 @@ properties: - items: - enum: - mediatek,mt8183-disp-color
- mediatek,mt8186-disp-color - mediatek,mt8192-disp-color - mediatek,mt8195-disp-color - const: mediatek,mt8173-disp-colordiff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml index 8180ed0a89ff..8ad8187c02d1 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,dither. yaml @@ -26,6 +26,7 @@ properties: - const: mediatek,mt8183-disp-dither - items: - enum:
- mediatek,mt8186-disp-dither - mediatek,mt8192-disp-dither - mediatek,mt8195-disp-dither - const: mediatek,mt8183-disp-ditherdiff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml index 5f1825b4512b..a89ea0ea7542 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.y aml @@ -27,6 +27,7 @@ properties: - const: mediatek,mt8183-disp-gamma - items: - enum:
- mediatek,mt8186-disp-gamma - mediatek,mt8192-disp-gamma - mediatek,mt8195-disp-gamma - const: mediatek,mt8183-disp-gammadiff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml index b470fbb1b40a..3fdad71210b4 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,mutex.y aml @@ -29,6 +29,7 @@ properties: - mediatek,mt8167-disp-mutex - mediatek,mt8173-disp-mutex - mediatek,mt8183-disp-mutex
- mediatek,mt8186-disp-mutex - mediatek,mt8192-disp-mutex - mediatek,mt8195-disp-mutexdiff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl- 2l.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl- 2l.yaml index da999ba53b7c..4e94f4e947ad 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl- 2l.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl- 2l.yaml @@ -25,6 +25,10 @@ properties: - const: mediatek,mt8183-disp-ovl-2l - items: - const: mediatek,mt8192-disp-ovl-2l
- items:- enum:- mediatek,mt8186-disp-ovl-2l- const: mediatek,mt8192-disp-ovl-2lreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l index 51f8235f1b1b..a2a27d0ca038 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ovl.yam l @@ -38,6 +38,10 @@ properties: - enum: - mediatek,mt8195-disp-ovl - const: mediatek,mt8183-disp-ovl
- items:- enum:- mediatek,mt8186-disp-ovl- const: mediatek,mt8192-disp-ovlreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,postmas k.yaml b/Documentation/devicetree/bindings/display/mediatek/mediatek,postmas k.yaml index 2d769422e29f..654080bfbdfb 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,postmas k.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,postmas k.yaml @@ -23,6 +23,10 @@ properties: oneOf: - items: - const: mediatek,mt8192-disp-postmask
- items:- enum:- mediatek,mt8186-disp-postmask- const: mediatek,mt8192-disp-postmaskreg: maxItems: 1
diff --git a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml index 9a6756f185ee..0882ae86e6c4 100644
a/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,rdma.ya ml @@ -38,6 +38,7 @@ properties: - const: mediatek,mt2701-disp-rdma - items: - enum:
- mediatek,mt8186-disp-rdma - mediatek,mt8192-disp-rdma - const: mediatek,mt8183-disp-rdma
From: Yongqiang Niu yongqiang.niu@mediatek.com
Add mmsys driver data and compatible for MT8186 in mtk_drm_drv.c.
Signed-off-by: Yongqiang Niu yongqiang.niu@mediatek.com Signed-off-by: Rex-BC Chen rex-bc.chen@mediatek.com Reviewed-by: CK Hu ck.hu@mediatek.com Reviewed-by: AngeloGioacchino Del Regno angelogioacchino.delregno@collabora.com --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 33 ++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 247c6ff277ef..c5f88295b434 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -158,6 +158,24 @@ static const enum mtk_ddp_comp_id mt8183_mtk_ddp_ext[] = { DDP_COMPONENT_DPI0, };
+static const enum mtk_ddp_comp_id mt8186_mtk_ddp_main[] = { + DDP_COMPONENT_OVL0, + DDP_COMPONENT_RDMA0, + DDP_COMPONENT_COLOR0, + DDP_COMPONENT_CCORR, + DDP_COMPONENT_AAL0, + DDP_COMPONENT_GAMMA, + DDP_COMPONENT_POSTMASK0, + DDP_COMPONENT_DITHER, + DDP_COMPONENT_DSI0, +}; + +static const enum mtk_ddp_comp_id mt8186_mtk_ddp_ext[] = { + DDP_COMPONENT_OVL_2L0, + DDP_COMPONENT_RDMA1, + DDP_COMPONENT_DPI0, +}; + static const enum mtk_ddp_comp_id mt8192_mtk_ddp_main[] = { DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0, @@ -221,6 +239,13 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { .ext_len = ARRAY_SIZE(mt8183_mtk_ddp_ext), };
+static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { + .main_path = mt8186_mtk_ddp_main, + .main_len = ARRAY_SIZE(mt8186_mtk_ddp_main), + .ext_path = mt8186_mtk_ddp_ext, + .ext_len = ARRAY_SIZE(mt8186_mtk_ddp_ext), +}; + static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { .main_path = mt8192_mtk_ddp_main, .main_len = ARRAY_SIZE(mt8192_mtk_ddp_main), @@ -461,6 +486,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8183-disp-mutex", .data = (void *)MTK_DISP_MUTEX }, + { .compatible = "mediatek,mt8186-disp-mutex", + .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8192-disp-mutex", .data = (void *)MTK_DISP_MUTEX }, { .compatible = "mediatek,mt8173-disp-od", @@ -509,12 +536,16 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt8183-dpi", .data = (void *)MTK_DPI }, + { .compatible = "mediatek,mt8186-dpi", + .data = (void *)MTK_DPI }, { .compatible = "mediatek,mt2701-dsi", .data = (void *)MTK_DSI }, { .compatible = "mediatek,mt8173-dsi", .data = (void *)MTK_DSI }, { .compatible = "mediatek,mt8183-dsi", .data = (void *)MTK_DSI }, + { .compatible = "mediatek,mt8186-dsi", + .data = (void *)MTK_DSI }, { } };
@@ -531,6 +562,8 @@ static const struct of_device_id mtk_drm_of_ids[] = { .data = &mt8173_mmsys_driver_data}, { .compatible = "mediatek,mt8183-mmsys", .data = &mt8183_mmsys_driver_data}, + { .compatible = "mediatek,mt8186-mmsys", + .data = &mt8186_mmsys_driver_data}, { .compatible = "mediatek,mt8192-mmsys", .data = &mt8192_mmsys_driver_data}, { }
dri-devel@lists.freedesktop.org
-
CK Hu -
Rex-BC Chen