diff mbox series

[2/4] clk / soc: mediatek: Bind clock and gpu driver for mt2712

Message ID 20200331214609.1742152-2-enric.balletbo@collabora.com (mailing list archive)
State New, archived
Headers show
Series [1/4] soc: mediatek: Enable mmsys driver by default if Mediatek arch is selected | expand

Commit Message

Enric Balletbo i Serra March 31, 2020, 9:46 p.m. UTC 
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>
---
If you have this hardware, please kindly provide your tested tag. Only
build tested.

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

Comments

Chun-Kuang Hu March 31, 2020, 11:27 p.m. UTC | #1 
Hi, Enric:

Enric Balletbo i Serra <enric.balletbo@collabora.com> 於 2020年4月1日 週三 上午5:47寫道：
>
> 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.

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

>
> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> ---
> If you have this hardware, please kindly provide your tested tag. Only
> build tested.
>
>  drivers/clk/mediatek/clk-mt2712-mm.c | 8 ++------
>  drivers/soc/mediatek/mtk-mmsys.c     | 8 ++++++++
>  2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-mt2712-mm.c b/drivers/clk/mediatek/clk-mt2712-mm.c
> index 1c5948be35f3..660c1f63293f 100644
> --- 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,11 +147,6 @@ 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 = {
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index 05e322c9c301..c7d3b7bcfa32 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
> @@ -80,6 +80,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",
>  };
> @@ -319,6 +323,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,
> --
> 2.25.1
>
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
kernel test robot April 1, 2020, 12:34 a.m. UTC | #2 
Hi Enric,

I love your patch! Yet something to improve:

[auto build test ERROR on next-20200331]
[cannot apply to clk/clk-next robh/for-next rockchip/for-next keystone/next arm64/for-next/core arm-soc/for-next shawnguo/for-next arm/for-next xlnx/master linus/master v5.6 v5.6-rc7 v5.6-rc6 v5.6]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Enric-Balletbo-i-Serra/soc-mediatek-Enable-mmsys-driver-by-default-if-Mediatek-arch-is-selected/20200401-054911
base:    3eb7cccdb3ae41ebb6a2f5f1ccd2821550c61fe1
config: i386-allyesconfig (attached as .config)
compiler: gcc-7 (Debian 7.4.0-6) 7.4.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/clk/mediatek/clk-mt2712-mm.c:154:21: error: 'of_match_clk_mt2712_mm' undeclared here (not in a function)
      .of_match_table = of_match_clk_mt2712_mm,
                        ^~~~~~~~~~~~~~~~~~~~~~

vim +/of_match_clk_mt2712_mm +154 drivers/clk/mediatek/clk-mt2712-mm.c

e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  149  
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  150  static struct platform_driver clk_mt2712_mm_drv = {
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  151  	.probe = clk_mt2712_mm_probe,
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  152  	.driver = {
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  153  		.name = "clk-mt2712-mm",
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23 @154  		.of_match_table = of_match_clk_mt2712_mm,
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  155  	},
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  156  };
e2f744a82d725a weiyi.lu@mediatek.com 2017-10-23  157  

:::::: The code at line 154 was first introduced by commit
:::::: e2f744a82d725ab55091cccfb8e527b4220471f0 clk: mediatek: Add MT2712 clock support

:::::: TO: weiyi.lu@mediatek.com <weiyi.lu@mediatek.com>
:::::: CC: Stephen Boyd <sboyd@codeaurora.org>

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/clk/mediatek/clk-mt2712-mm.c b/drivers/clk/mediatek/clk-mt2712-mm.c
index 1c5948be35f3..660c1f63293f 100644
--- 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,11 +147,6 @@  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 = {
diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
index 05e322c9c301..c7d3b7bcfa32 100644
--- a/drivers/soc/mediatek/mtk-mmsys.c
+++ b/drivers/soc/mediatek/mtk-mmsys.c
@@ -80,6 +80,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",
 };
@@ -319,6 +323,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,