[resend PATCH v6 10/12] clk: mediatek: mt8183: switch mmsys to platform device probing

[Matthias Brugger]

On 09/12/2019 09:51, CK Hu wrote:
> Hi, Matthias:
> 
> On Sat, 2019-12-07 at 23:47 +0100, matthias.bgg at kernel.org wrote:
>> From: Matthias Brugger <mbrugger at suse.com>
>>
>> Switch probing for the MMSYS to support invocation to a
>> plain paltform device. The driver will be probed by the DRM subsystem.
>>
>> Singed-off-by: Matthias Brugger <mbrugger at suse.com>
>> ---
>>  drivers/clk/mediatek/clk-mt8183-mm.c | 39 +++++++++++++++++++---------
>>  1 file changed, 27 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/clk/mediatek/clk-mt8183-mm.c b/drivers/clk/mediatek/clk-mt8183-mm.c
>> index 720c696b506d..e6dcad18d81a 100644
>> --- a/drivers/clk/mediatek/clk-mt8183-mm.c
>> +++ b/drivers/clk/mediatek/clk-mt8183-mm.c
>> @@ -3,14 +3,20 @@
>>  // Copyright (c) 2018 MediaTek Inc.
>>  // Author: Weiyi Lu <weiyi.lu at mediatek.com>
>>  
>> +#include <linux/module.h>
>>  #include <linux/clk-provider.h>
>>  #include <linux/platform_device.h>
>> +#include <linux/slab.h>
>>  
>>  #include "clk-mtk.h"
>>  #include "clk-gate.h"
>>  
>>  #include <dt-bindings/clock/mt8183-clk.h>
>>  
>> +struct clk_mt8183_mm_priv {
>> +	struct clk_onecell_data *clk_data;
>> +};
>> +
>>  static const struct mtk_gate_regs mm0_cg_regs = {
>>  	.set_ofs = 0x104,
>>  	.clr_ofs = 0x108,
>> @@ -84,28 +90,37 @@ static const struct mtk_gate mm_clks[] = {
>>  
>>  static int clk_mt8183_mm_probe(struct platform_device *pdev)
>>  {
>> -	struct clk_onecell_data *clk_data;
>> -	struct device_node *node = pdev->dev.of_node;
>> +	struct clk_mt8183_mm_priv *private;
>> +	struct device_node *node = pdev->dev.parent->of_node;
>> +
>> +	private = devm_kzalloc(&pdev->dev, sizeof(*private), GFP_KERNEL);
>> +	if (!private)
>> +		return -ENOMEM;
>>  
>> -	clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
>> +	private->clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
>> +	platform_set_drvdata(pdev, private);
> 
> There is a more simple modification that you need not to define struct
> clk_mt8183_mm_priv,
> 
> clk_data = mtk_alloc_clk_data(CLK_MM_NR_CLK);
> platform_set_drvdata(pdev, clk_data);
> 

Yes you are right, I'll fix that for all the drivers.

Thanks,
Matthias

> Regards,
> CK
> 
>>  
>>  	mtk_clk_register_gates(node, mm_clks, ARRAY_SIZE(mm_clks),
>> -			clk_data);
>> +			private->clk_data);
>>  
>> -	return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
>> +	return of_clk_add_provider(node, of_clk_src_onecell_get,
>> +			private->clk_data);
>>  }
>>  
>> -static const struct of_device_id of_match_clk_mt8183_mm[] = {
>> -	{ .compatible = "mediatek,mt8183-mmsys", },
>> -	{}
>> -};
>> +static int clk_mt8183_mm_remove(struct platform_device *pdev)
>> +{
>> +	struct clk_mt8183_mm_priv *private = platform_get_drvdata(pdev);
>> +
>> +	kfree(private->clk_data);
>> +
>> +	return 0;
>> +}
>>  
>>  static struct platform_driver clk_mt8183_mm_drv = {
>>  	.probe = clk_mt8183_mm_probe,
>> +	.remove = clk_mt8183_mm_remove,
>>  	.driver = {
>>  		.name = "clk-mt8183-mm",
>> -		.of_match_table = of_match_clk_mt8183_mm,
>>  	},
>>  };
>> -
>> -builtin_platform_driver(clk_mt8183_mm_drv);
>> +module_platform_driver(clk_mt8183_mm_drv);
>