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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 740E4C4332F for ; Wed, 12 Oct 2022 23:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:To:Cc:From:Subject: References:In-Reply-To:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kohS/5r5y/Iyr5DmUcG6GPTnqxLoibUSDXQs/LIzPxY=; b=MLaPOegahA4lGi r2a/Cin/+jc+taso3GrXBBDIDZXvEm3BE4aHr7mQBcTvtodPFrdbRYfxY73QIe3uLlnJKy30d+o7G Q4xBXF70HkxmVifPIJZy99OiIxc8m8HRrjtTRofuSOje4rVyl5QMrGPHj1pWsliR4J3dLyqs7qIwm rbupNXf+ZSEgAkM6C1S9EnAhpkcH1QUH1fgL7eFkDH5UG7yigtyzpaQ0+fsUQmUwEbj2lgzodqLLy 0U+nmfaTPqwmKyiAKN4qxaRY5JUNoO85cha3n2ODIAumnqMuVx6YudXyjMpEQZu8k79JA3CcyN/6u xnhmBG6165YN955nYZgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oilQS-009j1B-0H; Wed, 12 Oct 2022 23:46:12 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oilQM-009izs-3e; Wed, 12 Oct 2022 23:46:08 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id AA2CACE1E62; Wed, 12 Oct 2022 23:46:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1BE5C433D7; Wed, 12 Oct 2022 23:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665618362; bh=+pfUEiIduhlBNqrU0eti7CXzRvmEWK6fBNSEQDXl2Z4=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=ANOCASuA/JRNVv2hDArfLiUrCT0q/dFzdQGyWNdMIjZDsREUKUmCGWSHA44Vk1uoR ZmosuECpa04PalV+Y9Aw4sG8lvv4ab9bTjZ36jBAbD305L/slSuKlOBARK8pjtvbuF xIKDb+nu6ge6JeCXC98VFNoaa5qpqwG2W1ItzF2nJBa1cvuBVDxZwhioaTWjDG1MIB J6OzD7L+qDYGMLAqbUyxp0y6aA6B6gCcJbpyEAF/R7Ve39BSHKPjDc8R2I/fkqTktP kx/guGIEHszsDcmMgHuLL15Gf3qWuN3tu5BgpCSUV6AQBIscVMn+mIla1Osh6lcS5X lAEoVDJmnuVUw== MIME-Version: 1.0 In-Reply-To: <20221007104842.13164-1-rex-bc.chen@mediatek.com> References: <20221007104842.13164-1-rex-bc.chen@mediatek.com> Subject: Re: [PATCH v5] reset: mediatek: Move mediatek system clock reset to reset folder From: Stephen Boyd Cc: runyang.chen@mediatek.com, miles.chen@mediatek.com, wenst@chromium.org, angelogioacchino.delregno@collabora.com, nfraprado@collabora.com, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Project_Global_Chrome_Upstream_Group@mediatek.com, Bo-Chen Chen To: Bo-Chen Chen , matthias.bgg@gmail.com, mturquette@baylibre.com, p.zabel@pengutronix.de Date: Wed, 12 Oct 2022 16:45:59 -0700 User-Agent: alot/0.10 Message-Id: <20221012234601.E1BE5C433D7@smtp.kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221012_164606_512160_90350616 X-CRM114-Status: GOOD ( 25.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Quoting Bo-Chen Chen (2022-10-07 03:48:42) > To manager mediatek system clock reset easier, we move the driver to > drivers/reset. > > - Create reset/mediatek folder. > - Move clk/mediatek/reset.c to reset/mediatek/reset-mediatek-sysclk.c > - Because we don't want to build in unsed static variable (For example, > if we use mt8186, we don't want to build in the variable of MT8195.), > we use clk KConfig to do this. > - Move reset data which are scattered around the mediatek drivers to > reset-mtxxxx.c. > - For mtk clk drivers which support device, we can ues > mtk_reset_controller_register() to register reset controller using > auxiliary bus. > - For mtk clk drivers which do not support device (only support > device_node), we use mtk_reset_{init/remove}_with_node to register > reset controller. > > Signed-off-by: Bo-Chen Chen [...] > diff --git a/drivers/clk/mediatek/Kconfig b/drivers/clk/mediatek/Kconfig > index 843cea0c7a44..bcd073ada0e9 100644 > --- a/drivers/clk/mediatek/Kconfig > +++ b/drivers/clk/mediatek/Kconfig > @@ -8,6 +8,8 @@ menu "Clock driver for MediaTek SoC" > config COMMON_CLK_MEDIATEK > tristate > select RESET_CONTROLLER > + select RESET_MEDIATEK_SYSCLK Is this select necessary? > + select AUXILIARY_BUS > help > MediaTek SoCs' clock support. > > diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c > index d31f01d0ba1c..61b7ee23738a 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -444,6 +444,63 @@ void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num, > } > EXPORT_SYMBOL_GPL(mtk_clk_unregister_dividers); > > +static void mtk_reset_unregister_adev(void *_adev) > +{ > + struct auxiliary_device *adev = _adev; > + > + auxiliary_device_delete(adev); > +} > + > +static void mtk_reset_adev_release(struct device *dev) > +{ > + struct auxiliary_device *adev = to_auxiliary_dev(dev); > + > + auxiliary_device_uninit(adev); > + > + kfree(adev); > +} > + > +static struct auxiliary_device *mtk_reset_adev_alloc(struct device *dev, const char *name) > +{ > + struct auxiliary_device *adev; > + int ret; > + > + adev = kzalloc(sizeof(*adev), GFP_KERNEL); > + if (!adev) > + return ERR_PTR(-ENOMEM); > + > + adev->name = name; > + adev->dev.parent = dev; > + adev->dev.release = mtk_reset_adev_release; > + > + ret = auxiliary_device_init(adev); > + if (ret) { > + kfree(adev); > + return ERR_PTR(ret); > + } > + > + return adev; > +} > + > +int mtk_reset_controller_register(struct device *dev, const char *name) > +{ > + struct auxiliary_device *adev; > + int ret; > + > + adev = mtk_reset_adev_alloc(dev, name); > + if (IS_ERR(adev)) > + return PTR_ERR(adev); > + > + ret = auxiliary_device_add(adev); > + if (ret) { > + auxiliary_device_uninit(adev); > + return ret; > + } > + > + return devm_add_action_or_reset(dev, mtk_reset_unregister_adev, adev); > +} > +EXPORT_SYMBOL_GPL(mtk_reset_controller_register); > + > int mtk_clk_simple_probe(struct platform_device *pdev) > { > const struct mtk_clk_desc *mcd; > @@ -470,9 +527,8 @@ int mtk_clk_simple_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, clk_data); > > - if (mcd->rst_desc) { > - r = mtk_register_reset_controller_with_dev(&pdev->dev, > - mcd->rst_desc); > + if (mcd->rst_name) { > + r = mtk_reset_controller_register(&pdev->dev, mcd->rst_name); > if (r) > goto unregister_clks; > } Can you split this part off to a different patch? It would make it easier to review. And then you stack the reset part of the patch after this. > diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h > index 63ae7941aa92..9578643ef5a2 100644 > --- a/drivers/clk/mediatek/clk-mtk.h > +++ b/drivers/clk/mediatek/clk-mtk.h > @@ -7,14 +7,14 @@ > #ifndef __DRV_CLK_MTK_H > #define __DRV_CLK_MTK_H > > +#include > #include > #include > #include > +#include > #include > #include > > -#include "reset.h" > - > #define MAX_MUX_GATE_BIT 31 > #define INVALID_MUX_GATE_BIT (MAX_MUX_GATE_BIT + 1) > > @@ -195,10 +195,12 @@ void mtk_clk_unregister_ref2usb_tx(struct clk_hw *hw); > struct mtk_clk_desc { > const struct mtk_gate *clks; > size_t num_clks; > - const struct mtk_clk_rst_desc *rst_desc; > + char *rst_name; > }; > > int mtk_clk_simple_probe(struct platform_device *pdev); > int mtk_clk_simple_remove(struct platform_device *pdev); > > +int mtk_reset_controller_register(struct device *dev, const char *name); > + > #endif /* __DRV_CLK_MTK_H */ > diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c > deleted file mode 100644 > index 290ceda84ce4..000000000000 > --- a/drivers/clk/mediatek/reset.c > +++ /dev/null This file could probably be deleted in yet another patch once nobody is using it. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel