clk: mediatek: support COMMON_CLK_MT8192 module build
Subsystems (2)
This patch set supports COMMON_CLK_MT8192 module build. Boot-up tested with builtin and module build:
load test:clk_mt8192_venc 16384 0 - Live 0xffff800008ff7000 clk_mt8192_vdec 16384 0 - Live 0xffff800008fef000 clk_mt8192_scp_adsp 16384 0 - Live 0xffff800008fe7000 clk_mt8192_msdc 16384 0 - Live 0xffff800008fdf000 clk_mt8192_mm 16384 0 - Live 0xffff800008fda000 clk_mt8192_mfg 16384 0 - Live 0xffff800008fd5000 clk_mt8192_mdp 16384 0 - Live 0xffff800008fd0000 clk_mt8192_ipe 16384 0 - Live 0xffff800008fcb000 clk_mt8192_imp_iic_wrap 16384 0 - Live 0xffff800008fc6000 clk_mt8192_img 16384 0 - Live 0xffff800008fc1000 clk_mt8192_cam 16384 0 - Live 0xffff800008fbc000 clk_mt8192_aud 16384 0 - Live 0xffff800008fb7000 clk_mt8192 40960 0 [permanent], Live 0xffff800008fa8000
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 1/3 clk: mediatek: export mtk_clk_simple_probe
Export mtk_clk_simple_probe() to support mt8192 module build.
--- drivers/clk/mediatek/clk-mtk.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/mediatek/clk-mtk.c +1 -0
@@ -332,5 +332,6 @@ int mtk_clk_simple_probe(struct platform_device *pdev)mtk_free_clk_data (clk_data);return r; } +EXPORT_SYMBOL_GPL (mtk_clk_simple_probe);MODULE_LICENSE ("GPL" );
Signature · 1 line
2.18.0
Stephen Boyd
maintainerRe: [PATCH 1/3] clk: mediatek: export mtk_clk_simple_probe
Quoting Miles Chen (2022-01-10 09:09:57)
Quoted 6 lines
Export
mtk_clk_simple_probe()to support mt8192 module build.Cc Chun-Jie Chen <[email protected]>Cc Chen-Yu Tsai <[email protected]>Signed-off-by Miles Chen <[email protected]>---
Please send a cover letter for multi-patch series.
Re: [PATCH 1/3] clk: mediatek: export mtk_clk_simple_probe
Quoted 1 line
Please send a cover letter for multi-patch series.
Sorry for that, I will submit a cover letter in next version.
Miles
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 2/3 clk: mediatek: clk-mt8192: drop CLK_OF_DECLARE_DRIVER
In reply to Miles Chenclk-mt8192.c uses CLK_OF_DECLARE_DRIVER and it does not work for kernel modules.
To support clk-mt8192 moudle build, move the clk_mt8192_top_init_early() logic to clk_mt8192_top_probe() and drop clk_mt8192_top_init_early() and CLK_OF_DECLARE_DRIVER.
--- drivers/clk/mediatek/clk-mt8192.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
drivers/clk/mediatek/clk-mt8192.c +5 -16
@@ -1179,31 +1179,20 @@ static const struct mtk_pll_data plls[] = {static struct clk_onecell_data *top_clk_data; -static void clk_mt8192_top_init_early (struct device_node *node) +static int clk_mt8192_top_probe (struct platform_device *pdev) { +struct device_node *node = pdev->dev.of_node; +int r; +void __iomem *base;int i; top_clk_data =mtk_alloc_clk_data (CLK_TOP_NR_CLK );if (!top_clk_data) -return ; +return -ENOMEM ;for (i =0 ; i <CLK_TOP_NR_CLK ; i++) top_clk_data->clks[i] =ERR_PTR (-EPROBE_DEFER ); -mtk_clk_register_factors (top_early_divs,ARRAY_SIZE (top_early_divs), top_clk_data); - -of_clk_add_provider (node, of_clk_src_onecell_get, top_clk_data); -} - -CLK_OF_DECLARE_DRIVER (mt8192_topckgen,"mediatek,mt8192-topckgen" , - clk_mt8192_top_init_early); - -static int clk_mt8192_top_probe (struct platform_device *pdev) -{ -struct device_node *node = pdev->dev.of_node; -int r; -void __iomem *base; - base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (base))return PTR_ERR (base);
Signature · 1 line
2.18.0
PATCH 3/3 clk: mediatek: support COMMON_CLK_MT8192 module build
In reply to Miles ChenTo support COMMON_CLK_MT8192* module build, add MODULE_LICENSE and include module.h.
--- drivers/clk/mediatek/Kconfig | 26 +++++++++---------- drivers/clk/mediatek/clk-mt8192-aud.c | 4 ++- drivers/clk/mediatek/clk-mt8192-cam.c | 4 ++- drivers/clk/mediatek/clk-mt8192-img.c | 4 ++- .../clk/mediatek/clk-mt8192-imp_iic_wrap.c | 4 ++- drivers/clk/mediatek/clk-mt8192-ipe.c | 4 ++- drivers/clk/mediatek/clk-mt8192-mdp.c | 4 ++- drivers/clk/mediatek/clk-mt8192-mfg.c | 4 ++- drivers/clk/mediatek/clk-mt8192-mm.c | 4 ++- drivers/clk/mediatek/clk-mt8192-msdc.c | 4 ++- drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 4 ++- drivers/clk/mediatek/clk-mt8192-vdec.c | 4 ++- drivers/clk/mediatek/clk-mt8192-venc.c | 4 ++- drivers/clk/mediatek/clk-mt8192.c | 2 ++ 14 files changed, 51 insertions(+), 25 deletions(-)
drivers/clk/mediatek/Kconfig +13 -13
@@ -496,7 +496,7 @@ config COMMON_CLK_MT8183_VENCSYS This driver supports MediaTek MT8183 vencsys clocks. config COMMON_CLK_MT8192 - bool "Clock driver for MediaTek MT8192" + tristate "Clock driver for MediaTek MT8192" depends on ARM64 || COMPILE_TEST select COMMON_CLK_MEDIATEK default ARM64
@@ -504,73 +504,73 @@ config COMMON_CLK_MT8192 This driver supports MediaTek MT8192 basic clocks. config COMMON_CLK_MT8192_AUDSYS - bool "Clock driver for MediaTek MT8192 audsys" + tristate "Clock driver for MediaTek MT8192 audsys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 audsys clocks. config COMMON_CLK_MT8192_CAMSYS - bool "Clock driver for MediaTek MT8192 camsys" + tristate "Clock driver for MediaTek MT8192 camsys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 camsys and camsys_raw clocks. config COMMON_CLK_MT8192_IMGSYS - bool "Clock driver for MediaTek MT8192 imgsys" + tristate "Clock driver for MediaTek MT8192 imgsys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 imgsys and imgsys2 clocks. config COMMON_CLK_MT8192_IMP_IIC_WRAP - bool "Clock driver for MediaTek MT8192 imp_iic_wrap" + tristate "Clock driver for MediaTek MT8192 imp_iic_wrap" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 imp_iic_wrap clocks. config COMMON_CLK_MT8192_IPESYS - bool "Clock driver for MediaTek MT8192 ipesys" + tristate "Clock driver for MediaTek MT8192 ipesys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 ipesys clocks. config COMMON_CLK_MT8192_MDPSYS - bool "Clock driver for MediaTek MT8192 mdpsys" + tristate "Clock driver for MediaTek MT8192 mdpsys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 mdpsys clocks. config COMMON_CLK_MT8192_MFGCFG - bool "Clock driver for MediaTek MT8192 mfgcfg" + tristate "Clock driver for MediaTek MT8192 mfgcfg" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 mfgcfg clocks. config COMMON_CLK_MT8192_MMSYS - bool "Clock driver for MediaTek MT8192 mmsys" + tristate "Clock driver for MediaTek MT8192 mmsys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 mmsys clocks. config COMMON_CLK_MT8192_MSDC - bool "Clock driver for MediaTek MT8192 msdc" + tristate "Clock driver for MediaTek MT8192 msdc" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 msdc and msdc_top clocks. config COMMON_CLK_MT8192_SCP_ADSP - bool "Clock driver for MediaTek MT8192 scp_adsp" + tristate "Clock driver for MediaTek MT8192 scp_adsp" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 scp_adsp clocks. config COMMON_CLK_MT8192_VDECSYS - bool "Clock driver for MediaTek MT8192 vdecsys" + tristate "Clock driver for MediaTek MT8192 vdecsys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 vdecsys and vdecsys_soc clocks. config COMMON_CLK_MT8192_VENCSYS - bool "Clock driver for MediaTek MT8192 vencsys" + tristate "Clock driver for MediaTek MT8192 vencsys" depends on COMMON_CLK_MT8192 help This driver supports MediaTek MT8192 vencsys clocks.
drivers/clk/mediatek/clk-mt8192-aud.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_platform.h> #include <linux/platform_device.h>
@@ -115,4 +116,5 @@ static struct platform_driver clk_mt8192_aud_drv = { }, }; -builtin_platform_driver (clk_mt8192_aud_drv); +module_platform_driver (clk_mt8192_aud_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-cam.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -104,4 +105,5 @@ static struct platform_driver clk_mt8192_cam_drv = { }, }; -builtin_platform_driver (clk_mt8192_cam_drv); +module_platform_driver (clk_mt8192_cam_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-img.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -67,4 +68,5 @@ static struct platform_driver clk_mt8192_img_drv = { }, }; -builtin_platform_driver (clk_mt8192_img_drv); +module_platform_driver (clk_mt8192_img_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -116,4 +117,5 @@ static struct platform_driver clk_mt8192_imp_iic_wrap_drv = { }, }; -builtin_platform_driver (clk_mt8192_imp_iic_wrap_drv); +module_platform_driver (clk_mt8192_imp_iic_wrap_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-ipe.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -54,4 +55,5 @@ static struct platform_driver clk_mt8192_ipe_drv = { }, }; -builtin_platform_driver (clk_mt8192_ipe_drv); +module_platform_driver (clk_mt8192_ipe_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-mdp.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -79,4 +80,5 @@ static struct platform_driver clk_mt8192_mdp_drv = { }, }; -builtin_platform_driver (clk_mt8192_mdp_drv); +module_platform_driver (clk_mt8192_mdp_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-mfg.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -47,4 +48,5 @@ static struct platform_driver clk_mt8192_mfg_drv = { }, }; -builtin_platform_driver (clk_mt8192_mfg_drv); +module_platform_driver (clk_mt8192_mfg_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-mm.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/platform_device.h> #include "clk-mtk.h"
@@ -105,4 +106,5 @@ static struct platform_driver clk_mt8192_mm_drv = { }, }; -builtin_platform_driver (clk_mt8192_mm_drv); +module_platform_driver (clk_mt8192_mm_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-msdc.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -82,4 +83,5 @@ static struct platform_driver clk_mt8192_msdc_drv = { }, }; -builtin_platform_driver (clk_mt8192_msdc_drv); +module_platform_driver (clk_mt8192_msdc_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-scp_adsp.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -47,4 +48,5 @@ static struct platform_driver clk_mt8192_scp_adsp_drv = { }, }; -builtin_platform_driver (clk_mt8192_scp_adsp_drv); +module_platform_driver (clk_mt8192_scp_adsp_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-vdec.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -91,4 +92,5 @@ static struct platform_driver clk_mt8192_vdec_drv = { }, }; -builtin_platform_driver (clk_mt8192_vdec_drv); +module_platform_driver (clk_mt8192_vdec_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192-venc.c +3 -1
@@ -4,6 +4,7 @@// Author: Chun-Jie Chen <[email protected]> #include <linux/clk-provider.h> +#include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h>
@@ -50,4 +51,5 @@ static struct platform_driver clk_mt8192_venc_drv = { }, }; -builtin_platform_driver (clk_mt8192_venc_drv); +module_platform_driver (clk_mt8192_venc_drv); +MODULE_LICENSE ("GPL" );
drivers/clk/mediatek/clk-mt8192.c +2 -0
@@ -6,6 +6,7 @@#include <linux/clk.h> #include <linux/delay.h> #include <linux/mfd/syscon.h> +#include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_device.h>
@@ -1313,3 +1314,4 @@ static int __init clk_mt8192_init(void) }arch_initcall (clk_mt8192_init); +MODULE_LICENSE ("GPL" );
Signature · 1 line
2.18.0
Stephen Boyd
maintainerQuoting Miles Chen (2022-01-10 09:09:59)
Quoted 6 lines
To support COMMON_CLK_MT8192* module build, add
MODULE_LICENSEand includemodule.h.Cc Chun-Jie Chen <[email protected]>Cc Chen-Yu Tsai <[email protected]>Signed-off-by Miles Chen <[email protected]>
Have you tried removing the modules? And then reloading them? I also see that mtk_clk_simple_probe() doesn't actually unregister anything, it just frees some allocations. Please fix this before making these modules.
Hi,
Quoted 1 line
Have you tried removing the modules? And then reloading them? I also see
Thanks for the comment.
I did not try it because we do not unload our clk modules.
After testing I understand that the clock driver does not unregister clks so we cannot remove then unload it.
I think I have to add some unregister logic to these drivers.
Quoted 3 lines
that
mtk_clk_simple_probe()doesn't actually unregister anything, it just frees some allocations. Please fix this before making these modules.
You meant that mtk_clk_simple_probe() has no unregister logic in error path?
Miles
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Stephen Boyd
maintainerQuoting Miles Chen (2022-01-14 00:35:10)
Quoted 10 lines
Hi,
Quoted 1 line
Have you tried removing the modules? And then reloading them? I also see
Thanks for the comment.
I did not try it because we do not unload our clk modules.
After testing I understand that the clock driver does not unregister clks so we cannot remove then unload it.I think I have to add some unregister logic to these drivers.
Yes
Quoted 7 lines
Quoted 4 lines
that
mtk_clk_simple_probe()doesn't actually unregister anything, it just frees some allocations. Please fix this before making these modules.You meant that
mtk_clk_simple_probe()has no unregister logic in error path?
Yes
Quoted 6 lines
Quoted 4 lines
I did not try it because we do not unload our clk modules. After testing I understand that the clock driver does not unregister clks we cannot remove then unload it.
I think I have to add some unregister logic to these drivers.Yes
I will do this later.
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
that
mtk_clk_simple_probe()doesn't actually unregister anything, it just frees some allocations. Please fix this before making these modules.You meant that
mtk_clk_simple_probe()has no unregister logic in error pa=Yes
I post a patch to fix this first:
https://lore.kernel.org/lkml/[email protected]/T/#u
After this, I think that I can use mtk_clk_simple_probe() in other mediatek clk drivers by submitting some clean up patches.
Miles
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek