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 24277C5518F for ; Mon, 3 Aug 2026 14:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sTRHW9i9TMtUW5FfPYx0JQrWgxJP2eCw3MQffDw7Un4=; b=odJJ0nCJuFPJCfbeX+3xZoAXXM /cc7p1E6PVh91hpQ+1FYWtCk//ZJtk7RteCZNGJPqJgTNpoutymDG/fCzU2M2tiFjBuqCyvCeQctz 47cgiEr0qb4ezmhqaD+PEha00c4di3UyQjKWPPrXxdXwYmUhbm56u0tObOVQWrzQSBYdT9jQjG5SU nWAvKiBpc6IkiLd/Cyb0Pv6DzXcgDZ1oyc+EBKebnFldWX4abysivjjlvbhlu6DofumixekpY9AKS d+Gv0stMx4NYdkZhXrsjDvqVjiym5aNQPnpahXZXgl/W/S8P3HtFBz5FxOXTYlzmhpjTstXZtdz4b 81dODbeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqtW3-0000000HMaW-1QZx; Mon, 03 Aug 2026 14:19:43 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqtW0-0000000HMUs-0puz for linux-mediatek@lists.infradead.org; Mon, 03 Aug 2026 14:19:42 +0000 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-381c51fde6bso3684381a91.2 for ; Mon, 03 Aug 2026 07:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766779; x=1786371579; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=sTRHW9i9TMtUW5FfPYx0JQrWgxJP2eCw3MQffDw7Un4=; b=MKtuc3eaoCzgwq2KZyOuHvOMJ6DOTIfZf+nTnZvIhfR2M0er5Uv3w8jXUf/9Gee6nN q7/KKTIvy3YbiE3UeuBJS6R8TpEUM7Bmoy6wxPFguDXNX6+ZEyyLSAwdMuCcRX6XiS0v vyZek+YKPARyHOm1QMlQPIgyUcwEwjLklvfTrAPHL+yWVmZIBucs0dAhEuPwf/jvPr0m /afAEvo1JuM6vl4YU4V6CguSRinfA6VpUlODM5NqeGByC3m4Fzqkplnau6oa21kav/Ef ygS98/n5ZKtsjmXpCb0L3rCLAArE9Kq5hx/MJRmo9g5KJ2TrNU118faYGId2G480biOl R58g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785766779; x=1786371579; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=sTRHW9i9TMtUW5FfPYx0JQrWgxJP2eCw3MQffDw7Un4=; b=k93nvBuFB+271rq0zr47pPM7sHVl0DSTU9V7KN99/GfqnvqG+pg/jw12KuHFLbGYIj qnXZ5JjUiHukhaB6oluTOTL2dqY/GP9D/tLvDySWtQAjr+o5OtWr7vKqMWAS+lWhhi/V LAe4wazEPGQOS5DsiNrrttClejMPKpdfpA1fQ7HKqSHzpyJT/8j0nTuC1N5qV8rRoOWf i0IoYS1fp7be7mtYHZFtNF4ZpXqcR1zrcQuoHbAIgqIcV1b9EPMTUm8Op5BGk+C8IIH0 zTmKHpa79NYT0nLmkWc1O4RtdD1SA50Sl+vZo8ygz+b4aJdBP7wCc39uwzJ5qQK5Ow6c qaSA== X-Forwarded-Encrypted: i=1; AHgh+RrqoqGlOePoRrmUfdf4xfb+vm2uOG1NHwUd+D2NlkCXdPAVT5DVOR3WSzr30ynFKraOFxd4iAa31qwXbCZ2Bw==@lists.infradead.org X-Gm-Message-State: AOJu0Yx/h91/+9sfl5IJLJV2I9Qs2at46KRvCECBb7BoP/29yA38jElr XOQsqDdfcjQzOg6SolPubQSoaPQ5gbwNDI4Bjsc6MrrY+ZL8ol9tEjYd X-Gm-Gg: AR+sD124vD1rJvDqEQBjRdcEvMN63JphgpV/PruLNmbpOHylV8OyujmC/bYCl4Zgi5o GQxoNqwYsSdB2HH6lIyIhttmzvYb1Q/6EQnrPWjCR81u6NW2lnMtng2IyRv2zLcbltc7T5CN7UV YlbPpL3JLmkkZxIHogmeORG0RuQJuwBFWIJLbcC2dsJVrrDSgZYDtIHjOMKdP7cOA2IAdHTDaF0 SuK9kfKYDw8xrSwwnhRfm9UF+BzVXT6FtZ2s977YQunscRoPuz2R0/vIM6Z5Xv7JIaF0Zp8+NPb dZl3TzLUiWIlOMN2V5evGgEIC3czwGbzRQhTaX8gNtXzHPryXO+eSAWKeeTajNNzeV1/Zk4Qtax nCIEqr3fYA7vUNmsppx8vg2T3wOjR9p/t2TVNz0wnc4RWn0gwmbUxttDVN3dznPNy1CKdmkULpQ tYjuQUdBW7O5MhDww/HCUx8PXmg5Ba5ZgVdxNnVbe1b9dBTKTFysOQl1O7lt34RqGNDVpeaQ1Vn 8bz7VvHvKyH4Q7eWQu2 X-Received: by 2002:a17:90b:562b:b0:37f:eafd:3505 with SMTP id 98e67ed59e1d1-38fbc4053e3mr8606814a91.6.1785766779400; Mon, 03 Aug 2026 07:19:39 -0700 (PDT) Received: from buffalo-ssd (M014013071096.v4.enabler.ne.jp. [14.13.71.96]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38fb30dff2esm4078462a91.13.2026.08.03.07.19.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 07:19:39 -0700 (PDT) From: Akari Tsuyukusa To: Michael Turquette , Stephen Boyd , Brian Masney , Matthias Brugger , AngeloGioacchino Del Regno , Yassine Oudjana , Richard Cochran Cc: Laura Nao , =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?= , Chen-Yu Tsai , Akari Tsuyukusa , Bartosz Golaszewski , Danilo Krummrich , Bjorn Helgaas , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Nicolas Frattaroli , Takashi Sakamoto , Haotian Zhang , Kees Cook , Miles Chen , Daniel Golle , Sam Shih , linux-clk@vger.kernel.org (open list:COMMON CLK FRAMEWORK), linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support), netdev@vger.kernel.org (open list:PTP HARDWARE CLOCK SUPPORT:Keyword:(?:\b|_)ptp(?:\b|_)), stable@vger.kernel.org Subject: [PATCH 29/32] clk: mediatek: mt8192: Switch to common probe/remove helpers Date: Mon, 3 Aug 2026 23:16:56 +0900 Message-ID: <20260803141659.559129-30-akkun11.open@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260803141659.559129-1-akkun11.open@gmail.com> References: <20260803141659.559129-1-akkun11.open@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260803_071940_278374_A1911B05 X-CRM114-Status: GOOD ( 14.87 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org The MT8192 clock drivers can use the MediaTek clock framework common initialization sequence. Reduce boilerplate code by creating struct mtk_clk_desc and using the mtk_clk_simple_probe/remove helpers. Signed-off-by: Akari Tsuyukusa --- drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 69 ++++---------------- drivers/clk/mediatek/clk-mt8192-aud.c | 26 +------- 2 files changed, 16 insertions(+), 79 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt8192-apmixedsys.c b/drivers/clk/mediatek/clk-mt8192-apmixedsys.c index e6ac40e2f12d..92593370f23b 100644 --- a/drivers/clk/mediatek/clk-mt8192-apmixedsys.c +++ b/drivers/clk/mediatek/clk-mt8192-apmixedsys.c @@ -143,72 +143,29 @@ static struct mtk_pllfh_data pllfhs[] = { FH(CLK_APMIXED_TVDPLL, FH_TVDPLL, 0x154), }; +static const struct mtk_clk_desc apmixed_desc = { + .clks = apmixed_clks, + .num_clks = ARRAY_SIZE(apmixed_clks), + .plls = plls, + .num_plls = ARRAY_SIZE(plls), + .fhctl_node = "mediatek,mt8192-fhctl", + .pllfhs = pllfhs, + .num_pllfhs = ARRAY_SIZE(pllfhs), +}; + static const struct of_device_id of_match_clk_mt8192_apmixed[] = { - { .compatible = "mediatek,mt8192-apmixedsys" }, + { .compatible = "mediatek,mt8192-apmixedsys", .data = &apmixed_desc }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_match_clk_mt8192_apmixed); -static int clk_mt8192_apmixed_probe(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data; - struct device_node *node = pdev->dev.of_node; - const u8 *fhctl_node = "mediatek,mt8192-fhctl"; - int r; - - clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR_CLK); - if (!clk_data) - return -ENOMEM; - - fhctl_parse_dt(fhctl_node, pllfhs, ARRAY_SIZE(pllfhs)); - - r = mtk_clk_register_pllfhs(&pdev->dev, plls, ARRAY_SIZE(plls), - pllfhs, ARRAY_SIZE(pllfhs), clk_data); - if (r) - goto free_clk_data; - - r = mtk_clk_register_gates(&pdev->dev, node, apmixed_clks, - ARRAY_SIZE(apmixed_clks), clk_data); - if (r) - goto unregister_plls; - - r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (r) - goto unregister_gates; - - platform_set_drvdata(pdev, clk_data); - - return r; - -unregister_gates: - mtk_clk_unregister_gates(apmixed_clks, ARRAY_SIZE(apmixed_clks), clk_data); -unregister_plls: - mtk_clk_unregister_pllfhs(plls, ARRAY_SIZE(plls), pllfhs, - ARRAY_SIZE(pllfhs), clk_data); -free_clk_data: - mtk_free_clk_data(clk_data); - return r; -} - -static void clk_mt8192_apmixed_remove(struct platform_device *pdev) -{ - struct device_node *node = pdev->dev.of_node; - struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev); - - of_clk_del_provider(node); - mtk_clk_unregister_gates(apmixed_clks, ARRAY_SIZE(apmixed_clks), clk_data); - mtk_clk_unregister_pllfhs(plls, ARRAY_SIZE(plls), pllfhs, - ARRAY_SIZE(pllfhs), clk_data); - mtk_free_clk_data(clk_data); -} - static struct platform_driver clk_mt8192_apmixed_drv = { .driver = { .name = "clk-mt8192-apmixed", .of_match_table = of_match_clk_mt8192_apmixed, }, - .probe = clk_mt8192_apmixed_probe, - .remove = clk_mt8192_apmixed_remove, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, }; module_platform_driver(clk_mt8192_apmixed_drv); MODULE_DESCRIPTION("MediaTek MT8192 apmixed clocks driver"); diff --git a/drivers/clk/mediatek/clk-mt8192-aud.c b/drivers/clk/mediatek/clk-mt8192-aud.c index f3ebf8713fbb..8625f656a2e4 100644 --- a/drivers/clk/mediatek/clk-mt8192-aud.c +++ b/drivers/clk/mediatek/clk-mt8192-aud.c @@ -80,29 +80,9 @@ static const struct mtk_gate aud_clks[] = { static const struct mtk_clk_desc aud_desc = { .clks = aud_clks, .num_clks = ARRAY_SIZE(aud_clks), + .populate_children = true, }; -static int clk_mt8192_aud_probe(struct platform_device *pdev) -{ - int r; - - r = mtk_clk_simple_probe(pdev); - if (r) - return r; - - r = devm_of_platform_populate(&pdev->dev); - if (r) - mtk_clk_simple_remove(pdev); - - return r; -} - -static void clk_mt8192_aud_remove(struct platform_device *pdev) -{ - of_platform_depopulate(&pdev->dev); - mtk_clk_simple_remove(pdev); -} - static const struct of_device_id of_match_clk_mt8192_aud[] = { { .compatible = "mediatek,mt8192-audsys", .data = &aud_desc }, { /* sentinel */ } @@ -110,8 +90,8 @@ static const struct of_device_id of_match_clk_mt8192_aud[] = { MODULE_DEVICE_TABLE(of, of_match_clk_mt8192_aud); static struct platform_driver clk_mt8192_aud_drv = { - .probe = clk_mt8192_aud_probe, - .remove = clk_mt8192_aud_remove, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8192-aud", .of_match_table = of_match_clk_mt8192_aud, -- 2.55.0