Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
---

 drivers/clk/mediatek/clk-mt6797-mm.c | 9 ++-------
 drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/clk/mediatek/clk-mt6797-mm.c b/drivers/clk/mediatek/clk-mt6797-mm.c
index 8f05653b387d..01fdce287247 100644
--- a/drivers/clk/mediatek/clk-mt6797-mm.c
+++ b/drivers/clk/mediatek/clk-mt6797-mm.c

@@ -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,
        },
 };

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index 783c3dd008b2..fee64c8d3020 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c

@@ -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
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek