[PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[Fabien Parent]

Add binding documentation for MT8167 SoC.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
---
 .../devicetree/bindings/arm/mediatek/mediatek,mmsys.txt          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
index d8c9108c3b4a..78c50733985c 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
@@ -13,6 +13,7 @@ Required Properties:
 	- "mediatek,mt6779-mmsys", "syscon"
 	- "mediatek,mt6797-mmsys", "syscon"
 	- "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon"
+	- "mediatek,mt8167-mmsys", "syscon"
 	- "mediatek,mt8173-mmsys", "syscon"
 	- "mediatek,mt8183-mmsys", "syscon"
 - #clock-cells: Must be 1
-- 
2.28.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] soc: mediatek: mmsys: Add support for MT8167 SoC

[Fabien Parent]

Add routing table for DSI on MT8167 SoC. The registers are mostly
incompatible with the current defines, so new one for MT8167 are added.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
---

This patch depends on the patch series
"soc: mediatek: Prepare MMSYS for DDP routing using tables"

[0] https://lore.kernel.org/patchwork/cover/1317813/

 drivers/soc/mediatek/mtk-mmsys.c | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index f00d6d08c9c5..9890990a74a9 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -85,6 +85,22 @@
 #define DSI_SEL_IN_RDMA				0x1
 #define DSI_SEL_IN_MASK				0x1
 
+/* MT8167 */
+#define MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN	0x030
+#define MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN	0x038
+#define MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN	0x058
+#define MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN		0x064
+#define MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN	0x06c
+
+#define MT8167_DITHER_MOUT_EN_RDMA0			BIT(0)
+#define MT8167_DITHER_MOUT_EN_MASK			0x7
+
+#define MT8167_RDMA0_SOUT_DSI0				0x2
+#define MT8167_RDMA0_SOUT_MASK				0x3
+
+#define MT8167_DSI0_SEL_IN_RDMA0			0x1
+#define MT8167_DSI0_SEL_IN_MASK				0x3
+
 struct mtk_mmsys_routes {
 	u32 from_comp;
 	u32 to_comp;
@@ -124,6 +140,30 @@ struct mtk_mmsys {
 	const struct mtk_mmsys_driver_data *data;
 };
 
+static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {
+	{
+		DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,
+		MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN,
+		OVL0_MOUT_EN_COLOR0, OVL0_MOUT_EN_COLOR0
+	}, {
+		DDP_COMPONENT_DITHER, DDP_COMPONENT_RDMA0,
+		MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN,
+		MT8167_DITHER_MOUT_EN_MASK, MT8167_DITHER_MOUT_EN_RDMA0
+	}, {
+		DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,
+		MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN,
+		COLOR0_SEL_IN_OVL0, COLOR0_SEL_IN_OVL0
+	}, {
+		DDP_COMPONENT_RDMA0, DDP_COMPONENT_DSI0,
+		MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN,
+		MT8167_DSI0_SEL_IN_MASK, MT8167_DSI0_SEL_IN_RDMA0
+	}, {
+		DDP_COMPONENT_RDMA0, DDP_COMPONENT_DSI0,
+		MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN,
+		MT8167_RDMA0_SOUT_MASK, MT8167_RDMA0_SOUT_DSI0
+	},
+};
+
 static const struct mtk_mmsys_routes mt8173_mmsys_routing_table[] = {
 	{
 		DDP_COMPONENT_BLS, DDP_COMPONENT_DSI0,
@@ -288,6 +328,12 @@ static const struct mtk_mmsys_routes mt8173_mmsys_routing_table[] = {
 	}
 };
 
+static const struct mtk_mmsys_driver_data mt8167_mmsys_driver_data = {
+	.clk_driver = "clk-mt8167-mm",
+	.routes = mt8167_mmsys_routing_table,
+	.num_routes = ARRAY_SIZE(mt8167_mmsys_routing_table),
+};
+
 static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
 	.clk_driver = "clk-mt8173-mm",
 	.routes = mt8173_mmsys_routing_table,
@@ -385,6 +431,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
 		.compatible = "mediatek,mt6797-mmsys",
 		.data = &mt6797_mmsys_driver_data,
 	},
+	{
+		.compatible = "mediatek,mt8167-mmsys",
+		.data = &mt8167_mmsys_driver_data,
+	},
 	{
 		.compatible = "mediatek,mt8173-mmsys",
 		.data = &mt8173_mmsys_driver_data,
-- 
2.28.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[Chun-Kuang Hu]

Hi, Fabien:

Fabien Parent <fparent@baylibre.com> 於 2020年10月28日 週三 上午12:07寫道：
>
> Add binding documentation for MT8167 SoC.
>

Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>


> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> ---
>  .../devicetree/bindings/arm/mediatek/mediatek,mmsys.txt          | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
> index d8c9108c3b4a..78c50733985c 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
> +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
> @@ -13,6 +13,7 @@ Required Properties:
>         - "mediatek,mt6779-mmsys", "syscon"
>         - "mediatek,mt6797-mmsys", "syscon"
>         - "mediatek,mt7623-mmsys", "mediatek,mt2701-mmsys", "syscon"
> +       - "mediatek,mt8167-mmsys", "syscon"
>         - "mediatek,mt8173-mmsys", "syscon"
>         - "mediatek,mt8183-mmsys", "syscon"
>  - #clock-cells: Must be 1
> --
> 2.28.0
>
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[Rob Herring]

On Tue, 27 Oct 2020 17:06:29 +0100, Fabien Parent wrote:
> Add binding documentation for MT8167 SoC.
> 
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> ---
>  .../devicetree/bindings/arm/mediatek/mediatek,mmsys.txt          | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[Chun-Kuang Hu]

Hi, Matthias:

Rob Herring <robh@kernel.org> 於 2020年10月31日 週六 上午3:17寫道：
>
> On Tue, 27 Oct 2020 17:06:29 +0100, Fabien Parent wrote:
> > Add binding documentation for MT8167 SoC.

Even though the title need to change to 'mt8167', this patch looks
good to me. How do you think about this patch? One drm patch [1]
depend on this patch, if you like this patch, could you applied this
patch first?

[1] https://patchwork.kernel.org/project/linux-mediatek/patch/20201023133130.194140-6-fparent@baylibre.com/

Regards,
Chun-Kuang.

> >
> > Signed-off-by: Fabien Parent <fparent@baylibre.com>
> > ---
> >  .../devicetree/bindings/arm/mediatek/mediatek,mmsys.txt          | 1 +
> >  1 file changed, 1 insertion(+)
> >
>
> Acked-by: Rob Herring <robh@kernel.org>
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[Fabien Parent]

Hi Matthias,

Pinging you in case you didn't see @Chun-Kuang Hu's question for you.

Thanks,
Best regards,
Fabien

On Sun, Jan 10, 2021 at 12:18 AM Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote:
>
> Hi, Matthias:
>
> Rob Herring <robh@kernel.org> 於 2020年10月31日 週六 上午3:17寫道：
> >
> > On Tue, 27 Oct 2020 17:06:29 +0100, Fabien Parent wrote:
> > > Add binding documentation for MT8167 SoC.
>
> Even though the title need to change to 'mt8167', this patch looks
> good to me. How do you think about this patch? One drm patch [1]
> depend on this patch, if you like this patch, could you applied this
> patch first?
>
> [1] https://patchwork.kernel.org/project/linux-mediatek/patch/20201023133130.194140-6-fparent@baylibre.com/
>
> Regards,
> Chun-Kuang.
>
> > >
> > > Signed-off-by: Fabien Parent <fparent@baylibre.com>
> > > ---
> > >  .../devicetree/bindings/arm/mediatek/mediatek,mmsys.txt          | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> >
> > Acked-by: Rob Herring <robh@kernel.org>
> >
> > _______________________________________________
> > Linux-mediatek mailing list
> > Linux-mediatek@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[Chun-Kuang Hu]

Hi, Matthias:

Ping again.

Regards,
Chun-Kuang.

Fabien Parent <fparent@baylibre.com> 於 2021年2月24日 週三 上午6:21寫道：
>
> Hi Matthias,
>
> Pinging you in case you didn't see @Chun-Kuang Hu's question for you.
>
> Thanks,
> Best regards,
> Fabien
>
> On Sun, Jan 10, 2021 at 12:18 AM Chun-Kuang Hu <chunkuang.hu@kernel.org> wrote:
> >
> > Hi, Matthias:
> >
> > Rob Herring <robh@kernel.org> 於 2020年10月31日 週六 上午3:17寫道：
> > >
> > > On Tue, 27 Oct 2020 17:06:29 +0100, Fabien Parent wrote:
> > > > Add binding documentation for MT8167 SoC.
> >
> > Even though the title need to change to 'mt8167', this patch looks
> > good to me. How do you think about this patch? One drm patch [1]
> > depend on this patch, if you like this patch, could you applied this
> > patch first?
> >
> > [1] https://patchwork.kernel.org/project/linux-mediatek/patch/20201023133130.194140-6-fparent@baylibre.com/
> >
> > Regards,
> > Chun-Kuang.
> >
> > > >
> > > > Signed-off-by: Fabien Parent <fparent@baylibre.com>
> > > > ---
> > > >  .../devicetree/bindings/arm/mediatek/mediatek,mmsys.txt          | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > >
> > >
> > > Acked-by: Rob Herring <robh@kernel.org>
> > >
> > > _______________________________________________
> > > Linux-mediatek mailing list
> > > Linux-mediatek@lists.infradead.org
> > > http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/2] soc: mediatek: mmsys: Add support for MT8167 SoC

[Matthias Brugger]

Hi Fabien,

Sorry for taking so long on that patch.
Generally the patch looks good, but I just merged a small change how we add new
SoC to the driver.
Please see comments below.

On 27/10/2020 17:06, Fabien Parent wrote:
> Add routing table for DSI on MT8167 SoC. The registers are mostly
> incompatible with the current defines, so new one for MT8167 are added.
> 
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> ---
> 
> This patch depends on the patch series
> "soc: mediatek: Prepare MMSYS for DDP routing using tables"
> 
> [0] https://lore.kernel.org/patchwork/cover/1317813/
> 
>  drivers/soc/mediatek/mtk-mmsys.c | 50 ++++++++++++++++++++++++++++++++
>  1 file changed, 50 insertions(+)
> 
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index f00d6d08c9c5..9890990a74a9 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
> @@ -85,6 +85,22 @@
>  #define DSI_SEL_IN_RDMA				0x1
>  #define DSI_SEL_IN_MASK				0x1
>  
> +/* MT8167 */
> +#define MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN	0x030
> +#define MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN	0x038
> +#define MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN	0x058
> +#define MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN		0x064
> +#define MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN	0x06c
> +
> +#define MT8167_DITHER_MOUT_EN_RDMA0			BIT(0)
> +#define MT8167_DITHER_MOUT_EN_MASK			0x7
> +
> +#define MT8167_RDMA0_SOUT_DSI0				0x2
> +#define MT8167_RDMA0_SOUT_MASK				0x3
> +
> +#define MT8167_DSI0_SEL_IN_RDMA0			0x1
> +#define MT8167_DSI0_SEL_IN_MASK				0x3
> +
>  struct mtk_mmsys_routes {
>  	u32 from_comp;
>  	u32 to_comp;
> @@ -124,6 +140,30 @@ struct mtk_mmsys {
>  	const struct mtk_mmsys_driver_data *data;
>  };
>  
> +static const struct mtk_mmsys_routes mt8167_mmsys_routing_table[] = {

Please put the defines and the routing table in a separate header file
mt8167-mmsys.h

Thanks and once again sorry for the inconvenience.
Matthias

> +	{
> +		DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,
> +		MT8167_DISP_REG_CONFIG_DISP_OVL0_MOUT_EN,
> +		OVL0_MOUT_EN_COLOR0, OVL0_MOUT_EN_COLOR0
> +	}, {
> +		DDP_COMPONENT_DITHER, DDP_COMPONENT_RDMA0,
> +		MT8167_DISP_REG_CONFIG_DISP_DITHER_MOUT_EN,
> +		MT8167_DITHER_MOUT_EN_MASK, MT8167_DITHER_MOUT_EN_RDMA0
> +	}, {
> +		DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0,
> +		MT8167_DISP_REG_CONFIG_DISP_COLOR0_SEL_IN,
> +		COLOR0_SEL_IN_OVL0, COLOR0_SEL_IN_OVL0
> +	}, {
> +		DDP_COMPONENT_RDMA0, DDP_COMPONENT_DSI0,
> +		MT8167_DISP_REG_CONFIG_DISP_DSI0_SEL_IN,
> +		MT8167_DSI0_SEL_IN_MASK, MT8167_DSI0_SEL_IN_RDMA0
> +	}, {
> +		DDP_COMPONENT_RDMA0, DDP_COMPONENT_DSI0,
> +		MT8167_DISP_REG_CONFIG_DISP_RDMA0_SOUT_SEL_IN,
> +		MT8167_RDMA0_SOUT_MASK, MT8167_RDMA0_SOUT_DSI0
> +	},
> +};
> +
>  static const struct mtk_mmsys_routes mt8173_mmsys_routing_table[] = {
>  	{
>  		DDP_COMPONENT_BLS, DDP_COMPONENT_DSI0,
> @@ -288,6 +328,12 @@ static const struct mtk_mmsys_routes mt8173_mmsys_routing_table[] = {
>  	}
>  };
>  
> +static const struct mtk_mmsys_driver_data mt8167_mmsys_driver_data = {
> +	.clk_driver = "clk-mt8167-mm",
> +	.routes = mt8167_mmsys_routing_table,
> +	.num_routes = ARRAY_SIZE(mt8167_mmsys_routing_table),
> +};
> +
>  static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
>  	.clk_driver = "clk-mt8173-mm",
>  	.routes = mt8173_mmsys_routing_table,
> @@ -385,6 +431,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
>  		.compatible = "mediatek,mt6797-mmsys",
>  		.data = &mt6797_mmsys_driver_data,
>  	},
> +	{
> +		.compatible = "mediatek,mt8167-mmsys",
> +		.data = &mt8167_mmsys_driver_data,
> +	},
>  	{
>  		.compatible = "mediatek,mt8173-mmsys",
>  		.data = &mt8173_mmsys_driver_data,
> 

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] dt-bindings: mediatek: mmsys: add mt1867 binding

[Matthias Brugger]

Hi Chun-Kuang,

On 10/01/2021 00:17, Chun-Kuang Hu wrote:
> Hi, Matthias:
> 
> Rob Herring <robh@kernel.org> 於 2020年10月31日 週六 上午3:17寫道：
>>
>> On Tue, 27 Oct 2020 17:06:29 +0100, Fabien Parent wrote:
>>> Add binding documentation for MT8167 SoC.
> 
> Even though the title need to change to 'mt8167', this patch looks
> good to me. How do you think about this patch? One drm patch [1]
> depend on this patch, if you like this patch, could you applied this
> patch first?
> 
> [1] https://patchwork.kernel.org/project/linux-mediatek/patch/20201023133130.194140-6-fparent@baylibre.com/
> 

I just pushed the latest version [1] of this to v5.12-next/soc-2

I'll try to get this in for v5.13, if not possible we can sync again on how to
fix this.

Regards,
Matthias

[1]
https://patchwork.kernel.org/project/linux-mediatek/patch/20210405200354.2194930-1-fparent@baylibre.com/

> Regards,
> Chun-Kuang.
> 
>>>
>>> Signed-off-by: Fabien Parent <fparent@baylibre.com>
>>> ---
>>>  .../devicetree/bindings/arm/mediatek/mediatek,mmsys.txt          | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>
>> Acked-by: Rob Herring <robh@kernel.org>
>>
>> _______________________________________________
>> Linux-mediatek mailing list
>> Linux-mediatek@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel