Thread (4 messages) 4 messages, 2 authors, 2021-10-01

Re: [PATCH v9, 2/2] soc: mediatek: mmsys: Add mt8192 mmsys routing table

From: Enric Balletbo Serra <eballetbo@gmail.com>
Date: 2021-10-01 06:47:13
Also in: dri-devel, linux-arm-kernel, linux-mediatek, lkml

Hi Yongqiang,

This patch already have my reviewed tag but I just noticed a small nit


Missatge de Yongqiang Niu [off-list ref] del dia dj., 30
de set. 2021 a les 16:00:
quoted hunk ↗ jump to hunk
mt8192 has different routing registers than mt8183

Signed-off-by: Yongqiang Niu <redacted>
Reviewed-by: Enric Balletbo i Serra <redacted>
---
 drivers/soc/mediatek/mt8192-mmsys.h | 77 +++++++++++++++++++++++++++++
 drivers/soc/mediatek/mtk-mmsys.c    | 11 +++++
 2 files changed, 88 insertions(+)
 create mode 100644 drivers/soc/mediatek/mt8192-mmsys.h
diff --git a/drivers/soc/mediatek/mt8192-mmsys.h b/drivers/soc/mediatek/mt8192-mmsys.h
new file mode 100644
index 000000000000..7ea1531ee8af
--- /dev/null
+++ b/drivers/soc/mediatek/mt8192-mmsys.h
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __SOC_MEDIATEK_MT8192_MMSYS_H
+#define __SOC_MEDIATEK_MT8192_MMSYS_H
+
+#define MT8192_MMSYS_OVL_MOUT_EN               0xf04
+#define MT8192_DISP_OVL1_2L_MOUT_EN            0xf08
+#define MT8192_DISP_OVL0_2L_MOUT_EN            0xf18
+#define MT8192_DISP_OVL0_MOUT_EN               0xf1c
+#define MT8192_DISP_RDMA0_SEL_IN               0xf2c
+#define MT8192_DISP_RDMA0_SOUT_SEL             0xf30
+#define MT8192_DISP_CCORR0_SOUT_SEL            0xf34
+#define MT8192_DISP_AAL0_SEL_IN                        0xf38
+#define MT8192_DISP_DITHER0_MOUT_EN            0xf3c
+#define MT8192_DISP_DSI0_SEL_IN                        0xf40
+#define MT8192_DISP_OVL2_2L_MOUT_EN            0xf4c
+
+#define MT8192_DISP_OVL0_GO_BLEND                      BIT(0)
+#define MT8192_DITHER0_MOUT_IN_DSI0                    BIT(0)
+#define MT8192_OVL0_MOUT_EN_DISP_RDMA0                 BIT(0)
+#define MT8192_OVL2_2L_MOUT_EN_RDMA4                   BIT(0)
+#define MT8192_DISP_OVL0_GO_BG                         BIT(1)
+#define MT8192_DISP_OVL0_2L_GO_BLEND                   BIT(2)
+#define MT8192_DISP_OVL0_2L_GO_BG                      BIT(3)
+#define MT8192_OVL1_2L_MOUT_EN_RDMA1                   BIT(4)
+#define MT8192_OVL0_MOUT_EN_OVL0_2L                    BIT(4)
+#define MT8192_RDMA0_SEL_IN_OVL0_2L                    0x3
+#define MT8192_RDMA0_SOUT_COLOR0                       0x1
+#define MT8192_CCORR0_SOUT_AAL0                                0x1
+#define MT8192_AAL0_SEL_IN_CCORR0                      0x1
+#define MT8192_DSI0_SEL_IN_DITHER0                     0x1
+
+static const struct mtk_mmsys_routes mmsys_mt8192_routing_table[] = {
+       {
+               DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_RDMA0,
+               MT8192_DISP_OVL0_2L_MOUT_EN, MT8192_OVL0_MOUT_EN_DISP_RDMA0,
+               MT8192_OVL0_MOUT_EN_DISP_RDMA0
+       }, {
+               DDP_COMPONENT_OVL_2L2, DDP_COMPONENT_RDMA4,
+               MT8192_DISP_OVL2_2L_MOUT_EN, MT8192_OVL2_2L_MOUT_EN_RDMA4,
+               MT8192_OVL2_2L_MOUT_EN_RDMA4
+       }, {
+               DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
+               MT8192_DISP_DITHER0_MOUT_EN, MT8192_DITHER0_MOUT_IN_DSI0,
+               MT8192_DITHER0_MOUT_IN_DSI0
+       }, {
+               DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_RDMA0,
+               MT8192_DISP_RDMA0_SEL_IN, MT8192_RDMA0_SEL_IN_OVL0_2L,
+               MT8192_RDMA0_SEL_IN_OVL0_2L
+       }, {
+               DDP_COMPONENT_CCORR, DDP_COMPONENT_AAL0,
+               MT8192_DISP_AAL0_SEL_IN, MT8192_AAL0_SEL_IN_CCORR0,
+               MT8192_AAL0_SEL_IN_CCORR0
+       }, {
+               DDP_COMPONENT_DITHER, DDP_COMPONENT_DSI0,
+               MT8192_DISP_DSI0_SEL_IN, MT8192_DSI0_SEL_IN_DITHER0,
+               MT8192_DSI0_SEL_IN_DITHER0
+       }, {
+               DDP_COMPONENT_RDMA0, DDP_COMPONENT_COLOR0,
+               MT8192_DISP_RDMA0_SOUT_SEL, MT8192_RDMA0_SOUT_COLOR0,
+               MT8192_RDMA0_SOUT_COLOR0
+       }, {
+               DDP_COMPONENT_CCORR, DDP_COMPONENT_AAL0,
+               MT8192_DISP_CCORR0_SOUT_SEL, MT8192_CCORR0_SOUT_AAL0,
+               MT8192_CCORR0_SOUT_AAL0
+       }, {
+               DDP_COMPONENT_OVL0, DDP_COMPONENT_OVL_2L0,
+               MT8192_MMSYS_OVL_MOUT_EN, MT8192_DISP_OVL0_GO_BG,
+               MT8192_DISP_OVL0_GO_BG,
+       }, {
+               DDP_COMPONENT_OVL_2L0, DDP_COMPONENT_RDMA0,
+               MT8192_MMSYS_OVL_MOUT_EN, MT8192_DISP_OVL0_2L_GO_BLEND,
+               MT8192_DISP_OVL0_2L_GO_BLEND,
+       }
+};
+
+#endif /* __SOC_MEDIATEK_MT8192_MMSYS_H */
diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index a78e88f27b62..6e97d1468183 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -14,6 +14,7 @@
 #include "mt8167-mmsys.h"
 #include "mt8183-mmsys.h"
 #include "mt8365-mmsys.h"
+#include "mt8192-mmsys.h"

 static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = {
        .clk_driver = "clk-mt2701-mm",
@@ -59,6 +60,12 @@ static const struct mtk_mmsys_driver_data mt8365_mmsys_driver_data = {
        .num_routes = ARRAY_SIZE(mt8365_mmsys_routing_table),
 };

+static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = {
+       .clk_driver = "clk-mt8192-mm",
+       .routes = mmsys_mt8192_routing_table,
+       .num_routes = ARRAY_SIZE(mmsys_mt8192_routing_table),
+};
+
For better readability it would be nice if you put this structure by
SoC order. That's before mt8365 struct and after mt8183 struct.
quoted hunk ↗ jump to hunk
 struct mtk_mmsys {
        void __iomem *regs;
        const struct mtk_mmsys_driver_data *data;
@@ -171,6 +178,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt8365-mmsys",
                .data = &mt8365_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt8192-mmsys",
+               .data = &mt8192_mmsys_driver_data,
+       },
The same here,  for better readability would be nice if you put this
fields by SoC order. That's before mt8365 fields and after mt8183
fields.

Thanks,
  Enric
        { }
 };

--
2.25.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help