Skip to contentSkip to conversation

clk/soc: mediatek: mt8183: Bind clock driver from platform device

PATCH In review [email protected] 5 participants 20 messages May 18, 2020 – May 20, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 clk/soc: mediatek: mt8183: Bind clock driver from platform device

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

 drivers/clk/mediatek/clk-mt8183-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt8183-mm.c +2 -7
index 720c696b506d..9d60e09619c1 100644
@@ -84,8 +84,9 @@ static const struct mtk_gate mm_clks[] = {
 
 static int clk_mt8183_mm_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
+	struct device_node *node = dev->parent->of_node;
 	struct clk_onecell_data *clk_data;
-	struct device_node *node = pdev->dev.of_node;
 
 	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -95,16 +96,10 @@ static int clk_mt8183_mm_probe(struct platform_device *pdev)
 	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
 }
 
-static const struct of_device_id of_match_clk_mt8183_mm[] = {
-	{ .compatible = "mediatek,mt8183-mmsys", },
-	{}
-};
-
 static struct platform_driver clk_mt8183_mm_drv = {
 	.probe = clk_mt8183_mm_probe,
 	.driver = {
 		.name = "clk-mt8183-mm",
-		.of_match_table = of_match_clk_mt8183_mm,
 	},
 };
 
drivers/soc/mediatek/mtk-mmsys.c +8 -0
index cacafe23c823..783c3dd008b2 100644
@@ -92,6 +92,10 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
 	.clk_driver = "clk-mt8173-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
+	.clk_driver = "clk-mt8183-mm",
+};
+
 static unsigned int mtk_mmsys_ddp_mout_en(enum mtk_ddp_comp_id cur,
 					  enum mtk_ddp_comp_id next,
 					  unsigned int *addr)
@@ -339,6 +343,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
 		.compatible = "mediatek,mt8173-mmsys",
 		.data = &mt8173_mmsys_driver_data,
 	},
+	{
+		.compatible = "mediatek,mt8183-mmsys",
+		.data = &mt8183_mmsys_driver_data,
+	},
 	{ }
 };
 
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/4 clk/soc: mediatek: mt6797: Bind clock driver from platform device

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

 drivers/clk/mediatek/clk-mt6797-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt6797-mm.c +2 -7
index 8f05653b387d..01fdce287247 100644
@@ -92,16 +92,12 @@ static const struct mtk_gate mm_clks[] = {
 		 "clk26m", 3),
 };
 
-static const struct of_device_id of_match_clk_mt6797_mm[] = {
-	{ .compatible = "mediatek,mt6797-mmsys", },
-	{}
-};
-
 static int clk_mt6797_mm_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
+	struct device_node *node = dev->parent->of_node;
 	struct clk_onecell_data *clk_data;
 	int r;
-	struct device_node *node = pdev->dev.of_node;
 
 	clk_data = mtk_alloc_clk_data(CLK_MM_NR);
 
@@ -121,7 +117,6 @@ static struct platform_driver clk_mt6797_mm_drv = {
 	.probe = clk_mt6797_mm_probe,
 	.driver = {
 		.name = "clk-mt6797-mm",
-		.of_match_table = of_match_clk_mt6797_mm,
 	},
 };
 
drivers/soc/mediatek/mtk-mmsys.c +8 -0
index 783c3dd008b2..fee64c8d3020 100644
@@ -88,6 +88,10 @@ static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
 	.clk_driver = "clk-mt2712-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = {
+	.clk_driver = "clk-mt6797-mm",
+};
+
 static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
 	.clk_driver = "clk-mt8173-mm",
 };
@@ -339,6 +343,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
 		.compatible = "mediatek,mt2712-mmsys",
 		.data = &mt2712_mmsys_driver_data,
 	},
+	{
+		.compatible = "mediatek,mt6797-mmsys",
+		.data = &mt6797_mmsys_driver_data,
+	},
 	{
 		.compatible = "mediatek,mt8173-mmsys",
 		.data = &mt8173_mmsys_driver_data,
Signature · 1 line
2.26.2
Reviewed-by on v1 2/4
#2 lore raw

Re: [PATCH 2/4] clk/soc: mediatek: mt6797: Bind clock driver from platform device

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:32寫道:

Quoted 8 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

Quoted 72 lines

---

 drivers/clk/mediatek/clk-mt6797-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt6797-mm.c +2 -7
index 8f05653b387d..01fdce287247 100644
@@ -92,16 +92,12 @@ static const struct mtk_gate mm_clks[] = {
                 "clk26m", 3),
 };
 
-static const struct of_device_id of_match_clk_mt6797_mm[] = {
-       { .compatible = "mediatek,mt6797-mmsys", },
-       {}
-};
-
 static int clk_mt6797_mm_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
        struct clk_onecell_data *clk_data;
        int r;
-       struct device_node *node = pdev->dev.of_node;
 
        clk_data = mtk_alloc_clk_data(CLK_MM_NR);
 
@@ -121,7 +117,6 @@ static struct platform_driver clk_mt6797_mm_drv = {
        .probe = clk_mt6797_mm_probe,
        .driver = {
                .name = "clk-mt6797-mm",
-               .of_match_table = of_match_clk_mt6797_mm,
        },
 };
 
drivers/soc/mediatek/mtk-mmsys.c +8 -1
index 783c3dd008b2..fee64c8d3020 100644
@@ -88,6 +88,10 @@ static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
        .clk_driver = "clk-mt2712-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = {
+       .clk_driver = "clk-mt6797-mm",
+};
+
 static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
        .clk_driver = "clk-mt8173-mm",
 };
@@ -339,6 +343,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt2712-mmsys",
                .data = &mt2712_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt6797-mmsys",
+               .data = &mt6797_mmsys_driver_data,
+       },
        {
                .compatible = "mediatek,mt8173-mmsys",
                .data = &mt8173_mmsys_driver_data,
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer Acked-by on v1 2/4
#3 lore raw

Re: [PATCH 2/4] clk/soc: mediatek: mt6797: Bind clock driver from platform device

In reply to [email protected]

Quoting [email protected] (2020-05-18 04:31:54)

Quoted 9 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

maintainer
#4 lore raw

Re: [PATCH 2/4] clk/soc: mediatek: mt6797: Bind clock driver from platform device

Quoted 8 lines · Stephen Boyd

Quoting [email protected] (2020-05-18 04:31:54)

Quoted 7 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

Quoted 5 lines
Quoted 2 lines

---

Now queued for v5.7-next/soc

#5 lore raw

PATCH 3/4 clk/soc: mediatek: mt6779: Bind clock driver from platform device

In reply to [email protected]

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

 drivers/clk/mediatek/clk-mt6779-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt6779-mm.c +2 -7
index fb5fbb8e3e41..059c1a41ac7a 100644
@@ -84,15 +84,11 @@ static const struct mtk_gate mm_clks[] = {
 	GATE_MM1(CLK_MM_DISP_OVL_FBDC, "mm_disp_ovl_fbdc", "mm_sel", 16),
 };
 
-static const struct of_device_id of_match_clk_mt6779_mm[] = {
-	{ .compatible = "mediatek,mt6779-mmsys", },
-	{}
-};
-
 static int clk_mt6779_mm_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
+	struct device_node *node = dev->parent->of_node;
 	struct clk_onecell_data *clk_data;
-	struct device_node *node = pdev->dev.of_node;
 
 	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -106,7 +102,6 @@ static struct platform_driver clk_mt6779_mm_drv = {
 	.probe = clk_mt6779_mm_probe,
 	.driver = {
 		.name = "clk-mt6779-mm",
-		.of_match_table = of_match_clk_mt6779_mm,
 	},
 };
 
drivers/soc/mediatek/mtk-mmsys.c +8 -0
index fee64c8d3020..dc15808cf3a3 100644
@@ -88,6 +88,10 @@ static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
 	.clk_driver = "clk-mt2712-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt6779_mmsys_driver_data = {
+	.clk_driver = "clk-mt6779-mm",
+};
+
 static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = {
 	.clk_driver = "clk-mt6797-mm",
 };
@@ -343,6 +347,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
 		.compatible = "mediatek,mt2712-mmsys",
 		.data = &mt2712_mmsys_driver_data,
 	},
+	{
+		.compatible = "mediatek,mt6779-mmsys",
+		.data = &mt6779_mmsys_driver_data,
+	},
 	{
 		.compatible = "mediatek,mt6797-mmsys",
 		.data = &mt6797_mmsys_driver_data,
Signature · 1 line
2.26.2
#6 lore raw

Re: [PATCH 3/4] clk/soc: mediatek: mt6779: Bind clock driver from platform device

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:33寫道:

Quoted 50 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

 drivers/clk/mediatek/clk-mt6779-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt6779-mm.c +2 -7
index fb5fbb8e3e41..059c1a41ac7a 100644
@@ -84,15 +84,11 @@ static const struct mtk_gate mm_clks[] = {
        GATE_MM1(CLK_MM_DISP_OVL_FBDC, "mm_disp_ovl_fbdc", "mm_sel", 16),
 };
 
-static const struct of_device_id of_match_clk_mt6779_mm[] = {
-       { .compatible = "mediatek,mt6779-mmsys", },
-       {}
-};
-
 static int clk_mt6779_mm_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
        struct clk_onecell_data *clk_data;
-       struct device_node *node = pdev->dev.of_node;
 
        clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -106,7 +102,6 @@ static struct platform_driver clk_mt6779_mm_drv = {
        .probe = clk_mt6779_mm_probe,
        .driver = {
                .name = "clk-mt6779-mm",
-               .of_match_table = of_match_clk_mt6779_mm,
        },
 };
 
drivers/soc/mediatek/mtk-mmsys.c +0 -0
index fee64c8d3020..dc15808cf3a3 100644

drivers/soc/mediatek/mtk-mmsys.c static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = { · line 92

Quoted 5 lines
drivers/soc/mediatek/mtk-mmsys.c +2 -0
@@ -88,6 +88,10 @@ static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
        .clk_driver = "clk-mt2712-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt6779_mmsys_driver_data = {
+       .clk_driver = "clk-mt6779-mm",

This patch looks good to me, but I've one question: why drm driver just use single "mediatek-drm" for sub driver name, but clock driver has different name for each SoC?
Could we just use single name for clock driver such as "mediatek-clk-mm"?

Regards,
Chun-Kuang.

Quoted 24 lines
drivers/soc/mediatek/mtk-mmsys.c +6 -1
+};
+
 static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = {
        .clk_driver = "clk-mt6797-mm",
 };
@@ -343,6 +347,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt2712-mmsys",
                .data = &mt2712_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt6779-mmsys",
+               .data = &mt6779_mmsys_driver_data,
+       },
        {
                .compatible = "mediatek,mt6797-mmsys",
                .data = &mt6797_mmsys_driver_data,
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#7 lore raw

Re: [PATCH 3/4] clk/soc: mediatek: mt6779: Bind clock driver from platform device

Quoted 56 lines · Chun-Kuang Hu

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:33寫道:

Quoted 53 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

 drivers/clk/mediatek/clk-mt6779-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt6779-mm.c +2 -7
index fb5fbb8e3e41..059c1a41ac7a 100644
@@ -84,15 +84,11 @@ static const struct mtk_gate mm_clks[] = {
        GATE_MM1(CLK_MM_DISP_OVL_FBDC, "mm_disp_ovl_fbdc", "mm_sel", 16),
 };
 
-static const struct of_device_id of_match_clk_mt6779_mm[] = {
-       { .compatible = "mediatek,mt6779-mmsys", },
-       {}
-};
-
 static int clk_mt6779_mm_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
        struct clk_onecell_data *clk_data;
-       struct device_node *node = pdev->dev.of_node;
 
        clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -106,7 +102,6 @@ static struct platform_driver clk_mt6779_mm_drv = {
        .probe = clk_mt6779_mm_probe,
        .driver = {
                .name = "clk-mt6779-mm",
-               .of_match_table = of_match_clk_mt6779_mm,
        },
 };
 
drivers/soc/mediatek/mtk-mmsys.c +0 -0
index fee64c8d3020..dc15808cf3a3 100644
@@ -88,6 +88,10 @@ static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
        .clk_driver = "clk-mt2712-mm",
 };
 
Quoted 7 lines

drivers/soc/mediatek/mtk-mmsys.c static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = { · line 92

Quoted 2 lines
drivers/soc/mediatek/mtk-mmsys.c +2 -0
+static const struct mtk_mmsys_driver_data mt6779_mmsys_driver_data = {
+       .clk_driver = "clk-mt6779-mm",

This patch looks good to me, but I've one question: why drm driver just use single "mediatek-drm" for sub driver name, but clock driver has different name for each SoC?
Could we just use single name for clock driver such as "mediatek-clk-mm"?

Because the DRM for all SoCs are handled in the same driver, while we have a different clock drivers for each SoC. So we need to specify which clock driver we want to load.

If we want to change that, we would need to refactor heavily the clock drivers for all MediaTek SoCs. I don't think it's worth the effort.

Regards,
Matthias

Quoted 28 lines

Regards,
Chun-Kuang.

Quoted 24 lines
drivers/soc/mediatek/mtk-mmsys.c +6 -1
+};
+
 static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = {
        .clk_driver = "clk-mt6797-mm",
 };
@@ -343,6 +347,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt2712-mmsys",
                .data = &mt2712_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt6779-mmsys",
+               .data = &mt6779_mmsys_driver_data,
+       },
        {
                .compatible = "mediatek,mt6797-mmsys",
                .data = &mt6797_mmsys_driver_data,
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

Reviewed-by
#8 lore raw

Re: [PATCH 3/4] clk/soc: mediatek: mt6779: Bind clock driver from platform device

Matthias Brugger <[email protected]> 於 2020年5月20日 週三 上午5:26寫道:

Quoted 68 lines · Chun-Kuang Hu
Quoted 56 lines

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:33寫道:

Quoted 53 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

 drivers/clk/mediatek/clk-mt6779-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt6779-mm.c +2 -7
index fb5fbb8e3e41..059c1a41ac7a 100644
@@ -84,15 +84,11 @@ static const struct mtk_gate mm_clks[] = {
        GATE_MM1(CLK_MM_DISP_OVL_FBDC, "mm_disp_ovl_fbdc", "mm_sel", 16),
 };
 
-static const struct of_device_id of_match_clk_mt6779_mm[] = {
-       { .compatible = "mediatek,mt6779-mmsys", },
-       {}
-};
-
 static int clk_mt6779_mm_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
        struct clk_onecell_data *clk_data;
-       struct device_node *node = pdev->dev.of_node;
 
        clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -106,7 +102,6 @@ static struct platform_driver clk_mt6779_mm_drv = {
        .probe = clk_mt6779_mm_probe,
        .driver = {
                .name = "clk-mt6779-mm",
-               .of_match_table = of_match_clk_mt6779_mm,
        },
 };
 
drivers/soc/mediatek/mtk-mmsys.c +0 -0
index fee64c8d3020..dc15808cf3a3 100644
@@ -88,6 +88,10 @@ static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
        .clk_driver = "clk-mt2712-mm",
 };
 
Quoted 7 lines

drivers/soc/mediatek/mtk-mmsys.c static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = { · line 92

Quoted 2 lines
drivers/soc/mediatek/mtk-mmsys.c +2 -0
+static const struct mtk_mmsys_driver_data mt6779_mmsys_driver_data = {
+       .clk_driver = "clk-mt6779-mm",

This patch looks good to me, but I've one question: why drm driver just use single "mediatek-drm" for sub driver name, but clock driver has different name for each SoC?
Could we just use single name for clock driver such as "mediatek-clk-mm"?

Quoted 7 lines

Because the DRM for all SoCs are handled in the same driver, while we have a different clock drivers for each SoC. So we need to specify which clock driver we want to load.

If we want to change that, we would need to refactor heavily the clock drivers for all MediaTek SoCs. I don't think it's worth the effort.

OK, so for this patch,

Quoted 31 lines

Regards,
Matthias

Quoted 28 lines

Regards,
Chun-Kuang.

Quoted 24 lines
drivers/soc/mediatek/mtk-mmsys.c +6 -1
+};
+
 static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = {
        .clk_driver = "clk-mt6797-mm",
 };
@@ -343,6 +347,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt2712-mmsys",
                .data = &mt2712_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt6779-mmsys",
+               .data = &mt6779_mmsys_driver_data,
+       },
        {
                .compatible = "mediatek,mt6797-mmsys",
                .data = &mt6797_mmsys_driver_data,
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer Acked-by on v1 3/4
#9 lore raw

Re: [PATCH 3/4] clk/soc: mediatek: mt6779: Bind clock driver from platform device

In reply to [email protected]

Quoting [email protected] (2020-05-18 04:31:55)

Quoted 9 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

maintainer
#10 lore raw

Re: [PATCH 3/4] clk/soc: mediatek: mt6779: Bind clock driver from platform device

Quoted 8 lines · Stephen Boyd

Quoting [email protected] (2020-05-18 04:31:55)

Quoted 7 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

Quoted 5 lines
Quoted 2 lines

---

Now queued for v5.7-next/soc

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer Acked-by on v1 3/4
#11 lore raw

Re: [PATCH 3/4] clk/soc: mediatek: mt6779: Bind clock driver from platform device

In reply to [email protected]

Quoting [email protected] (2020-05-18 04:31:55)

Quoted 9 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

#12 lore raw

PATCH 4/4 arm64: dts: mt6797: Fix mmsys node name

In reply to [email protected]

From: Matthias Brugger <[email protected]>

Node names are supposed to match the class of the device. The mmsys node is a syscon as it provides more then just a clock controller. Update the name.

---

 arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt6797.dtsi +1 -1
index 136ef9527a0d..3efd032481ce 100644
@@ -233,7 +233,7 @@ uart3: serial@11005000 {
 		status = "disabled";
 	};
 
-	mmsys: mmsys_config@14000000 {
+	mmsys: syscon@14000000 {
 		compatible = "mediatek,mt6797-mmsys", "syscon";
 		reg = <0 0x14000000 0 0x1000>;
 		#clock-cells = <1>;
Signature · 1 line
2.26.2
Reviewed-by on v1 4/4
#13 lore raw

Re: [PATCH 4/4] arm64: dts: mt6797: Fix mmsys node name

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:33寫道:

Quoted 6 lines

From: Matthias Brugger <[email protected]>

Node names are supposed to match the class of the device. The mmsys node is a syscon as it provides more then just a clock controller. Update the name.

Quoted 29 lines

---

 arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt6797.dtsi +1 -2
index 136ef9527a0d..3efd032481ce 100644
@@ -233,7 +233,7 @@ uart3: serial@11005000 {
                status = "disabled";
        };
 
-       mmsys: mmsys_config@14000000 {
+       mmsys: syscon@14000000 {
                compatible = "mediatek,mt6797-mmsys", "syscon";
                reg = <0 0x14000000 0 0x1000>;
                #clock-cells = <1>;
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer
#14 lore raw

Re: [PATCH 4/4] arm64: dts: mt6797: Fix mmsys node name

Quoted 4 lines · Chun-Kuang Hu

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:33寫道:

Quoted 1 line
Quoted 8 lines
Quoted 5 lines

From: Matthias Brugger <[email protected]>

Node names are supposed to match the class of the device. The mmsys node is a syscon as it provides more then just a clock controller. Update the name.

Now queued for v5.7-next/dts64

Quoted 29 lines
Quoted 29 lines

---

 arch/arm64/boot/dts/mediatek/mt6797.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt6797.dtsi +1 -2
index 136ef9527a0d..3efd032481ce 100644
@@ -233,7 +233,7 @@ uart3: serial@11005000 {
                status = "disabled";
        };
 
-       mmsys: mmsys_config@14000000 {
+       mmsys: syscon@14000000 {
                compatible = "mediatek,mt6797-mmsys", "syscon";
                reg = <0 0x14000000 0 0x1000>;
                #clock-cells = <1>;
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

#15 lore raw
In reply to [email protected]

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:32寫道:

Quoted 7 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

You may need to let CONFIG_MTK_MMSYS depends on CONFIG_COMMON_CLK_MT8173_MMSYS || CONFIG_COMMON_CLK_MT8183_MMSYS

Regards,
Chun-Kuang.

Quoted 74 lines

---

 drivers/clk/mediatek/clk-mt8183-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt8183-mm.c +2 -7
index 720c696b506d..9d60e09619c1 100644
@@ -84,8 +84,9 @@ static const struct mtk_gate mm_clks[] = {
 
 static int clk_mt8183_mm_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
        struct clk_onecell_data *clk_data;
-       struct device_node *node = pdev->dev.of_node;
 
        clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -95,16 +96,10 @@ static int clk_mt8183_mm_probe(struct platform_device *pdev)
        return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
 }
 
-static const struct of_device_id of_match_clk_mt8183_mm[] = {
-       { .compatible = "mediatek,mt8183-mmsys", },
-       {}
-};
-
 static struct platform_driver clk_mt8183_mm_drv = {
        .probe = clk_mt8183_mm_probe,
        .driver = {
                .name = "clk-mt8183-mm",
-               .of_match_table = of_match_clk_mt8183_mm,
        },
 };
 
drivers/soc/mediatek/mtk-mmsys.c +8 -1
index cacafe23c823..783c3dd008b2 100644
@@ -92,6 +92,10 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
        .clk_driver = "clk-mt8173-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
+       .clk_driver = "clk-mt8183-mm",
+};
+
 static unsigned int mtk_mmsys_ddp_mout_en(enum mtk_ddp_comp_id cur,
                                          enum mtk_ddp_comp_id next,
                                          unsigned int *addr)
@@ -339,6 +343,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt8173-mmsys",
                .data = &mt8173_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt8183-mmsys",
+               .data = &mt8183_mmsys_driver_data,
+       },
        { }
 };
 
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer
#16 lore raw
Quoted 6 lines · Chun-Kuang Hu

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:32寫道:

Quoted 3 lines

From: Matthias Brugger <[email protected]>

Quoted 8 lines
Quoted 4 lines

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

You may need to let CONFIG_MTK_MMSYS depends on CONFIG_COMMON_CLK_MT8173_MMSYS || CONFIG_COMMON_CLK_MT8183_MMSYS

That will be fixed by:
https://patchwork.kernel.org/patch/11469521/

Otherwise this won't scale as we would need to add the SoCs using the mtk-mmsys driver and this will be a lot if not all.

Regards,
Matthias

Quoted 77 lines

Regards,
Chun-Kuang.

Quoted 74 lines

---

 drivers/clk/mediatek/clk-mt8183-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt8183-mm.c +2 -7
index 720c696b506d..9d60e09619c1 100644
@@ -84,8 +84,9 @@ static const struct mtk_gate mm_clks[] = {
 
 static int clk_mt8183_mm_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
        struct clk_onecell_data *clk_data;
-       struct device_node *node = pdev->dev.of_node;
 
        clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -95,16 +96,10 @@ static int clk_mt8183_mm_probe(struct platform_device *pdev)
        return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
 }
 
-static const struct of_device_id of_match_clk_mt8183_mm[] = {
-       { .compatible = "mediatek,mt8183-mmsys", },
-       {}
-};
-
 static struct platform_driver clk_mt8183_mm_drv = {
        .probe = clk_mt8183_mm_probe,
        .driver = {
                .name = "clk-mt8183-mm",
-               .of_match_table = of_match_clk_mt8183_mm,
        },
 };
 
drivers/soc/mediatek/mtk-mmsys.c +8 -1
index cacafe23c823..783c3dd008b2 100644
@@ -92,6 +92,10 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
        .clk_driver = "clk-mt8173-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
+       .clk_driver = "clk-mt8183-mm",
+};
+
 static unsigned int mtk_mmsys_ddp_mout_en(enum mtk_ddp_comp_id cur,
                                          enum mtk_ddp_comp_id next,
                                          unsigned int *addr)
@@ -339,6 +343,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt8173-mmsys",
                .data = &mt8173_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt8183-mmsys",
+               .data = &mt8183_mmsys_driver_data,
+       },
        { }
 };
 
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

Reviewed-by
#17 lore raw

Hi, Matthias:

Matthias Brugger <[email protected]> 於 2020年5月18日 週一 下午11:57寫道:

Quoted 19 lines · Chun-Kuang Hu
Quoted 6 lines

Hi, Matthias:

<[email protected]> 於 2020年5月18日 週一 下午7:32寫道:

Quoted 3 lines

From: Matthias Brugger <[email protected]>

Quoted 8 lines
Quoted 4 lines

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

You may need to let CONFIG_MTK_MMSYS depends on CONFIG_COMMON_CLK_MT8173_MMSYS || CONFIG_COMMON_CLK_MT8183_MMSYS

Quoted 5 lines

That will be fixed by:
https://patchwork.kernel.org/patch/11469521/

Otherwise this won't scale as we would need to add the SoCs using the mtk-mmsys driver and this will be a lot if not all.

I forgot that patch, so for this patch,

Quoted 81 lines

Regards,
Matthias

Quoted 77 lines

Regards,
Chun-Kuang.

Quoted 74 lines

---

 drivers/clk/mediatek/clk-mt8183-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/clk/mediatek/clk-mt8183-mm.c +2 -7
index 720c696b506d..9d60e09619c1 100644
@@ -84,8 +84,9 @@ static const struct mtk_gate mm_clks[] = {
 
 static int clk_mt8183_mm_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
        struct clk_onecell_data *clk_data;
-       struct device_node *node = pdev->dev.of_node;
 
        clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
 
@@ -95,16 +96,10 @@ static int clk_mt8183_mm_probe(struct platform_device *pdev)
        return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
 }
 
-static const struct of_device_id of_match_clk_mt8183_mm[] = {
-       { .compatible = "mediatek,mt8183-mmsys", },
-       {}
-};
-
 static struct platform_driver clk_mt8183_mm_drv = {
        .probe = clk_mt8183_mm_probe,
        .driver = {
                .name = "clk-mt8183-mm",
-               .of_match_table = of_match_clk_mt8183_mm,
        },
 };
 
drivers/soc/mediatek/mtk-mmsys.c +8 -1
index cacafe23c823..783c3dd008b2 100644
@@ -92,6 +92,10 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
        .clk_driver = "clk-mt8173-mm",
 };
 
+static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
+       .clk_driver = "clk-mt8183-mm",
+};
+
 static unsigned int mtk_mmsys_ddp_mout_en(enum mtk_ddp_comp_id cur,
                                          enum mtk_ddp_comp_id next,
                                          unsigned int *addr)
@@ -339,6 +343,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = {
                .compatible = "mediatek,mt8173-mmsys",
                .data = &mt8173_mmsys_driver_data,
        },
+       {
+               .compatible = "mediatek,mt8183-mmsys",
+               .data = &mt8183_mmsys_driver_data,
+       },
        { }
 };
 
--

2.26.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer Acked-by on v1 1/4
#18 lore raw
In reply to [email protected]

Quoting [email protected] (2020-05-18 04:31:53)

Quoted 9 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

---

maintainer
#19 lore raw
Quoted 8 lines · Stephen Boyd

Quoting [email protected] (2020-05-18 04:31:53)

Quoted 7 lines

From: Matthias Brugger <[email protected]>

The mmsys driver is now the top level entry point for the multimedia system (mmsys), we bind the clock driver by creating a platform device. We also bind the MediaTek DRM driver which is not yet implement and therefor will errror out for now.

Quoted 5 lines
Quoted 2 lines

---

Now queued for v5.7-next/soc