Linux-Media Archive on lore.kernel.org
 help / color / Atom feed
From: Matthias Brugger <matthias.bgg@gmail.com>
To: Enric Balletbo i Serra <enric.balletbo@collabora.com>,
	matthias.bgg@kernel.org, robh+dt@kernel.org,
	mark.rutland@arm.com, ck.hu@mediatek.com, p.zabel@pengutronix.de,
	airlied@linux.ie, mturquette@baylibre.com, sboyd@kernel.org,
	ulrich.hecht+renesas@gmail.com,
	laurent.pinchart@ideasonboard.com
Cc: sean.wang@mediatek.com, sean.wang@kernel.org,
	rdunlap@infradead.org, wens@csie.org, hsinyi@chromium.org,
	frank-w@public-files.de, drinkcat@chromium.org,
	linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org,
	devicetree@vger.kernel.org, mbrugger@suse.com
Subject: Re: [resend PATCH v6 06/12] clk: mediatek: mt2701: switch mmsys to platform device probing
Date: Thu, 13 Feb 2020 20:11:24 +0100
Message-ID: <f998ae82-fbbd-c5d8-00d6-e2196eac5a5c@gmail.com> (raw)
In-Reply-To: <c08e8d32-6126-7be3-4f5a-1b94a175a339@collabora.com>



On 09/12/2019 10:58, Enric Balletbo i Serra wrote:
> Hi Matthias,
> 
> On 7/12/19 23:47, matthias.bgg@kernel.org wrote:
>> From: Matthias Brugger <mbrugger@suse.com>
>>
>> Switch probing for the MMSYS to support invocation to a plain
>> paltform device. The driver will be probed by the DRM subsystem.
>>
>> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
>> ---
>>  drivers/clk/mediatek/clk-mt2701-mm.c | 41 ++++++++++++++++++++--------
>>  1 file changed, 29 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/clk/mediatek/clk-mt2701-mm.c b/drivers/clk/mediatek/clk-mt2701-mm.c
>> index 054b597d4a73..4a9433c2b2b8 100644
>> --- a/drivers/clk/mediatek/clk-mt2701-mm.c
>> +++ b/drivers/clk/mediatek/clk-mt2701-mm.c
>> @@ -4,14 +4,20 @@
>>   * Author: Shunli Wang <shunli.wang@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/mt2701-clk.h>
>>  
>> +struct clk_mt2701_mm_priv {
>> +	struct clk_onecell_data *clk_data;
>> +};
>> +
>>  static const struct mtk_gate_regs disp0_cg_regs = {
>>  	.set_ofs = 0x0104,
>>  	.clr_ofs = 0x0108,
>> @@ -79,23 +85,25 @@ static const struct mtk_gate mm_clks[] = {
>>  	GATE_DISP1(CLK_MM_TVE_FMM, "mm_tve_fmm", "mm_sel", 14),
>>  };
>>  
>> -static const struct of_device_id of_match_clk_mt2701_mm[] = {
>> -	{ .compatible = "mediatek,mt2701-mmsys", },
>> -	{}
>> -};
>> -
>>  static int clk_mt2701_mm_probe(struct platform_device *pdev)
>>  {
>> -	struct clk_onecell_data *clk_data;
>>  	int r;
>> -	struct device_node *node = pdev->dev.of_node;
>> +	struct device_node *node = pdev->dev.parent->of_node;
>> +	struct clk_mt2701_mm_priv *private;
>> +
>> +	private = devm_kzalloc(&pdev->dev, sizeof(*private), GFP_KERNEL);
>> +	if (!private)
>> +		return -ENOMEM;
>>  
>> -	clk_data = mtk_alloc_clk_data(CLK_MM_NR);
>> +	private->clk_data = mtk_alloc_clk_data(CLK_MM_NR);
>> +
>> +	platform_set_drvdata(pdev, private);
>>  
>>  	mtk_clk_register_gates(node, mm_clks, ARRAY_SIZE(mm_clks),
>> -						clk_data);
>> +					private->clk_data);
>>  
>> -	r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
>> +	r = of_clk_add_provider(node, of_clk_src_onecell_get,
>> +					private->clk_data);
>>  	if (r)
>>  		dev_err(&pdev->dev,
>>  			"could not register clock provider: %s: %d\n",
>> @@ -104,12 +112,21 @@ static int clk_mt2701_mm_probe(struct platform_device *pdev)
>>  	return r;
>>  }
>>  
>> +static int clk_mt2701_mm_remove(struct platform_device *pdev)
>> +{
>> +	struct clk_mt2701_mm_priv *private = platform_get_drvdata(pdev);
>> +
> 
> I think that private->clk_data->clks is also kallocated and need to be freed?
> 
> But I think that the best approach now is to switch to use devm allocations in
> clk-mt2701-mm.c and this remove function will not be needed.
> 

This is an API change which will affect over 50 drivers. For now I'll fix it by
adding a kfree here. I will send a follow-up patch to fix it in the API.

Good catch!
Matthias

>> +	kfree(private->clk_data);
>> +
>> +	return 0;
>> +}
>> +
>>  static struct platform_driver clk_mt2701_mm_drv = {
>>  	.probe = clk_mt2701_mm_probe,
>> +	.remove = clk_mt2701_mm_remove,
>>  	.driver = {
>>  		.name = "clk-mt2701-mm",
>> -		.of_match_table = of_match_clk_mt2701_mm,
>>  	},
>>  };
>>  
>> -builtin_platform_driver(clk_mt2701_mm_drv);
>> +module_platform_driver(clk_mt2701_mm_drv);
>>

  reply index

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-07 22:47 [resend PATCH v6 00/12] arm/arm64: mediatek: Fix mmsys " matthias.bgg
2019-12-07 22:47 ` [resend PATCH v6 01/12] dt-bindings: display: mediatek: Add mmsys binding description matthias.bgg
2019-12-09  5:12   ` CK Hu
2019-12-09  8:48     ` Enric Balletbo i Serra
2020-02-13 18:17     ` Matthias Brugger
2019-12-18 16:39   ` Rob Herring
2019-12-07 22:47 ` [resend PATCH v6 02/12] dt-bindings: mediatek: Add compatible for mt7623 matthias.bgg
2019-12-09  8:51   ` Enric Balletbo i Serra
2019-12-18 17:02   ` Rob Herring
2019-12-07 22:47 ` [resend PATCH v6 03/12] drm/mediatek: Use regmap for register access matthias.bgg
2019-12-09  5:16   ` CK Hu
2019-12-07 22:47 ` [resend PATCH v6 04/12] drm: mediatek: Omit warning on probe defers matthias.bgg
2019-12-09  5:19   ` CK Hu
2019-12-09  9:39   ` Enric Balletbo i Serra
2020-02-13 18:58     ` Matthias Brugger
2019-12-07 22:47 ` [resend PATCH v6 05/12] media: mtk-mdp: Check return value of of_clk_get matthias.bgg
2019-12-09  9:50   ` Enric Balletbo i Serra
2019-12-07 22:47 ` [resend PATCH v6 06/12] clk: mediatek: mt2701: switch mmsys to platform device probing matthias.bgg
2019-12-09  9:58   ` Enric Balletbo i Serra
2020-02-13 19:11     ` Matthias Brugger [this message]
2019-12-07 22:47 ` [resend PATCH v6 07/12] clk: mediatek: mt2712e: switch " matthias.bgg
2019-12-09  9:59   ` Enric Balletbo i Serra
2019-12-07 22:47 ` [resend PATCH v6 08/12] clk: mediatek: mt6779: switch mmsys " matthias.bgg
2019-12-09 10:01   ` Enric Balletbo i Serra
2019-12-07 22:47 ` [resend PATCH v6 09/12] clk: mediatek: mt6797: switch " matthias.bgg
2019-12-07 22:47 ` [resend PATCH v6 10/12] clk: mediatek: mt8183: switch mmsys " matthias.bgg
2019-12-09  8:51   ` CK Hu
2020-02-13 19:35     ` Matthias Brugger
2019-12-07 22:47 ` [resend PATCH v6 11/12] clk: mediatek: mt8173: " matthias.bgg
2019-12-07 22:47 ` [resend PATCH v6 12/12] drm/mediatek: Add support for mmsys through a pdev matthias.bgg
2019-12-09  5:34   ` CK Hu
2020-02-13 19:46     ` Matthias Brugger
2019-12-09 10:15   ` Enric Balletbo i Serra
2020-02-13  2:57 ` [resend PATCH v6 00/12] arm/arm64: mediatek: Fix mmsys device probing CK Hu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f998ae82-fbbd-c5d8-00d6-e2196eac5a5c@gmail.com \
    --to=matthias.bgg@gmail.com \
    --cc=airlied@linux.ie \
    --cc=ck.hu@mediatek.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=drinkcat@chromium.org \
    --cc=enric.balletbo@collabora.com \
    --cc=frank-w@public-files.de \
    --cc=hsinyi@chromium.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=matthias.bgg@kernel.org \
    --cc=mbrugger@suse.com \
    --cc=mturquette@baylibre.com \
    --cc=p.zabel@pengutronix.de \
    --cc=rdunlap@infradead.org \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@kernel.org \
    --cc=sean.wang@kernel.org \
    --cc=sean.wang@mediatek.com \
    --cc=ulrich.hecht+renesas@gmail.com \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Media Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-media/0 linux-media/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-media linux-media/ https://lore.kernel.org/linux-media \
		linux-media@vger.kernel.org
	public-inbox-index linux-media

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-media


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git