clk / soc: mediatek: Bind clock and gpu driver for mt2712

Now that the mmsys driver is the top-level entry point for the
multimedia subsystem, we could bind the clock and the gpu driver on
those devices that is expected to work, so the drm driver is
intantiated by the mmsys driver and display, hopefully, working again on
those devices.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20200401201736.2980433-2-enric.balletbo@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/drivers/clk/mediatek/clk-mt2712-mm.c b/drivers/clk/mediatek/clk-mt2712-mm.c
index 1c5948be35f3f20d6236e7435dea8c66112b1946..5519c3d68c1f5e2c4f6fb09ad529d4788e6e41f3 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2712-mm.c
+++ b/drivers/clk/mediatek/clk-mt2712-mm.c
@@ -128,9 +128,10 @@ static const struct mtk_gate mm_clks[] = {
 
 static int clk_mt2712_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_CLK);
 
@@ -146,16 +147,10 @@ static int clk_mt2712_mm_probe(struct platform_device *pdev)
        return r;
 }
 
-static const struct of_device_id of_match_clk_mt2712_mm[] = {
-       { .compatible = "mediatek,mt2712-mmsys", },
-       {}
-};
-
 static struct platform_driver clk_mt2712_mm_drv = {
        .probe = clk_mt2712_mm_probe,
        .driver = {
                .name = "clk-mt2712-mm",
-               .of_match_table = of_match_clk_mt2712_mm,
        },
 };
 

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index b0bb08a66b019ae4f8eff21471d5c17674916d05..da9039185aace9f20c545780c604d389e8e41865 100644 (file)
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -79,6 +79,10 @@ struct mtk_mmsys_driver_data {
        const char *clk_driver;
 };
 
+static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
+       .clk_driver = "clk-mt2712-mm",
+};
+
 static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
        .clk_driver = "clk-mt8173-mm",
 };
@@ -320,6 +324,10 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
 }
 
 static const struct of_device_id of_match_mtk_mmsys[] = {
+       {
+               .compatible = "mediatek,mt2712-mmsys",
+               .data = &mt2712_mmsys_driver_data,
+       },
        {
                .compatible = "mediatek,mt8173-mmsys",
                .data = &mt8173_mmsys_driver_data,