From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EA0AC2D0C0 for ; Mon, 9 Dec 2019 09:58:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E27A206D5 for ; Mon, 9 Dec 2019 09:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727349AbfLIJ6l (ORCPT ); Mon, 9 Dec 2019 04:58:41 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:40646 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727113AbfLIJ6k (ORCPT ); Mon, 9 Dec 2019 04:58:40 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 16FCF28BB97 Subject: Re: [resend PATCH v6 06/12] clk: mediatek: mt2701: switch mmsys to platform device probing To: 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 References: <20191207224740.24536-1-matthias.bgg@kernel.org> <20191207224740.24536-7-matthias.bgg@kernel.org> From: Enric Balletbo i Serra Message-ID: Date: Mon, 9 Dec 2019 10:58:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191207224740.24536-7-matthias.bgg@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Matthias, On 7/12/19 23:47, matthias.bgg@kernel.org wrote: > From: Matthias Brugger > > 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 > --- > 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 > */ > > +#include > #include > #include > +#include > > #include "clk-mtk.h" > #include "clk-gate.h" > > #include > > +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. > + 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); > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,UNWANTED_LANGUAGE_BODY, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72ABAC43603 for ; Mon, 9 Dec 2019 09:59:01 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45094206D5 for ; Mon, 9 Dec 2019 09:59:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sY3C2sV5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45094206D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DM6k/NRqF3bvQcmAVR5lKZ2Nd+9//O65nhBQ3nZ+gYg=; b=sY3C2sV5W0PR6r aPDwlKzY9HXLy8laWZPHr89aP8x8mWqPQYOKmtUgEitW1RJUwNW3vBCiWiSz9d0RKIylo61LQpVDZ B168YvBM5cSFTM+f46D7r28H/VowXloDrHDbqTjSGwmTJaHczNPcBROZxSDqB5K3w51ZzKN4wvHGX P0rDTTlEsyNk6RajESbI464KoaBdyVM4OfHcX8TudQIRWpU5RdpZDbBZbCMWhnRloPyEh98+F4MO9 Ay069q5oWXSCbj+gW5dwDvBTW9dg82ctUEHANTJsZWXIu7USWIoUdwmbImh+1deZbZRiDVyX8zJCb OryfHIPJvkSbsAK/WbaQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieFoW-0005iC-Q3; Mon, 09 Dec 2019 09:58:48 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieFoO-0005aH-54; Mon, 09 Dec 2019 09:58:41 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 16FCF28BB97 Subject: Re: [resend PATCH v6 06/12] clk: mediatek: mt2701: switch mmsys to platform device probing To: 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 References: <20191207224740.24536-1-matthias.bgg@kernel.org> <20191207224740.24536-7-matthias.bgg@kernel.org> From: Enric Balletbo i Serra Message-ID: Date: Mon, 9 Dec 2019 10:58:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191207224740.24536-7-matthias.bgg@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191209_015840_456684_E644E940 X-CRM114-Status: GOOD ( 18.35 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, rdunlap@infradead.org, frank-w@public-files.de, sean.wang@mediatek.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, sean.wang@kernel.org, wens@csie.org, drinkcat@chromium.org, linux-mediatek@lists.infradead.org, mbrugger@suse.com, hsinyi@chromium.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hi Matthias, On 7/12/19 23:47, matthias.bgg@kernel.org wrote: > From: Matthias Brugger > > 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 > --- > 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 > */ > > +#include > #include > #include > +#include > > #include "clk-mtk.h" > #include "clk-gate.h" > > #include > > +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. > + 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); > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10532C43603 for ; Mon, 9 Dec 2019 09:58:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9C89206D5 for ; Mon, 9 Dec 2019 09:58:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ctNThla7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9C89206D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KbJM6fymPQbZ2lGenXbTQiCp/CjrZ46WAoMpNwEjjJY=; b=ctNThla7A+nM9Z pmx4WgE5/D/EK4kz4l20hKzvuTgAhc6QydXoav/KFI3eYLQLZQd6ZDAc+iC4eMsH2ogNd3nQve0RU Ht03a0TxPthvZdyC6PAj0JM7+jcPj1b3d6nq1VzN2TGDu8qpw5sOogYLzN7S9n7VMhaCjy0PFUypM JeYEj+4DOfN8L/uoInLtcws0i/x6cvxKyMSRIFrH69Yi32Nho/5iREWx/ZhpXN+xRf/ZwGTHyZ5NJ oerRO6+kVRHhk6wP5mf75g0w3ouqKMDk9T0AyqPvXcv4ASpvRkRcjYqmoIPRlC8qGP7SMoBSXm+YX UcCJv5+WjGOJtGrHGsqg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieFoR-0005ai-Cq; Mon, 09 Dec 2019 09:58:43 +0000 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ieFoO-0005aH-54; Mon, 09 Dec 2019 09:58:41 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 16FCF28BB97 Subject: Re: [resend PATCH v6 06/12] clk: mediatek: mt2701: switch mmsys to platform device probing To: 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 References: <20191207224740.24536-1-matthias.bgg@kernel.org> <20191207224740.24536-7-matthias.bgg@kernel.org> From: Enric Balletbo i Serra Message-ID: Date: Mon, 9 Dec 2019 10:58:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191207224740.24536-7-matthias.bgg@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191209_015840_456684_E644E940 X-CRM114-Status: GOOD ( 18.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, rdunlap@infradead.org, frank-w@public-files.de, sean.wang@mediatek.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, sean.wang@kernel.org, wens@csie.org, drinkcat@chromium.org, linux-mediatek@lists.infradead.org, mbrugger@suse.com, hsinyi@chromium.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Matthias, On 7/12/19 23:47, matthias.bgg@kernel.org wrote: > From: Matthias Brugger > > 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 > --- > 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 > */ > > +#include > #include > #include > +#include > > #include "clk-mtk.h" > #include "clk-gate.h" > > #include > > +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. > + 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); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC2DFC43603 for ; Tue, 10 Dec 2019 08:41:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AC875206D5 for ; Tue, 10 Dec 2019 08:41:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AC875206D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B8426E84F; Tue, 10 Dec 2019 08:41:01 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC8A889DEA for ; Mon, 9 Dec 2019 09:58:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: eballetbo) with ESMTPSA id 16FCF28BB97 Subject: Re: [resend PATCH v6 06/12] clk: mediatek: mt2701: switch mmsys to platform device probing To: 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 References: <20191207224740.24536-1-matthias.bgg@kernel.org> <20191207224740.24536-7-matthias.bgg@kernel.org> From: Enric Balletbo i Serra Message-ID: Date: Mon, 9 Dec 2019 10:58:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191207224740.24536-7-matthias.bgg@kernel.org> Content-Language: en-US X-Mailman-Approved-At: Tue, 10 Dec 2019 08:40:05 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, rdunlap@infradead.org, frank-w@public-files.de, sean.wang@mediatek.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, sean.wang@kernel.org, wens@csie.org, drinkcat@chromium.org, linux-mediatek@lists.infradead.org, mbrugger@suse.com, hsinyi@chromium.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Matthias, On 7/12/19 23:47, matthias.bgg@kernel.org wrote: > From: Matthias Brugger > > 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 > --- > 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 > */ > > +#include > #include > #include > +#include > > #include "clk-mtk.h" > #include "clk-gate.h" > > #include > > +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. > + 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); > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel