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 67304C55182 for ; Mon, 3 Aug 2026 14:19:52 +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=MOFoWlQhXSMlLt2NpqseYEiE1kLb37cCFSxkURFuzbY=; b=feA0BSOqwrUxopgJTyOCiPIQkZ qgfXGxWpHqo1BZLDRyi4k5ZSd7W8xtGN2QkorIs3mzB3RA3Xh/wdECHvYwtWyGPYh1mFq/Ef2LJSB 6A3spvxe2vRfbAXgOki+4gOBqJ/stSRQHHo3GgDLjpPjAXy0gTd9vnp8RLaO+dLMLmmWyll01zC85 1NpWERyRPX3r6RcDHCmYR1LDKXTk51hDkdhftqiYnI90Q80aohF2dfoZC0XdQX8sKFP6QqP32jbBX z+oTr+BvtbiF7AaS9c6zeF5RvP36bvPr4bv6brxr5JEDXqrO0G5xkVIyDoX2Peggz70CS+kkhXRVr y8WtQWQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqtWB-0000000HMp1-2V1K; Mon, 03 Aug 2026 14:19:51 +0000 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wqtW4-0000000HMd1-3sJB for linux-mediatek@lists.infradead.org; Mon, 03 Aug 2026 14:19:50 +0000 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso32691925ad.2 for ; Mon, 03 Aug 2026 07:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766784; x=1786371584; 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=MOFoWlQhXSMlLt2NpqseYEiE1kLb37cCFSxkURFuzbY=; b=PZNWkg2p942pxYF5dRqi5liKKgpI1mOc2VTWOyN1YpqxuPs3lTrFJaBKmLgXHCzKSV +bLOv4g/+nQYFMXXNSM7e+JApyY4UA8OlXtp82Zu1qP3SriIUtkYodouOluUUsbPNXhh oDkjZarXjMIyBJJoiQoVvsA7VWk73sGIxKo51Mx99k+Pfw82e2/Saxw+DlMqxYNWZkUk s1BLHhwzDs+3YQbW7yJbdLQuOvQVZs/HvGRKVidWe90m6/gm5rQs7BuK90LOPkWd3LMv anR2oYsRxO6a/D3CXCE9tBBu0+KQi0S++ERhjRzXpW54hwuq89uZR2RxnR4dVFrgeeMe HGoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785766784; x=1786371584; 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=MOFoWlQhXSMlLt2NpqseYEiE1kLb37cCFSxkURFuzbY=; b=E6RiQhIflqZpflQfgxavXcGw82D4rSVqHTtw9Syye6cyssFl5sZLEF6vctDFHjtGsc DQs0ym2qa2FMkgw/SCc5Px1OTLKaBOdXsYevOKdcCZe6j0yKEn34ii3PP8u45xfIpzmV 7fqNgu8QIAYTIOQN0/I/2VLI4hxMc7iShxCoEPh2eFI2zclmj7TTFvEAnGbq/d1uHTIJ EW1Nb6l7vkEUTGy1FS6cysz1nHkhgyVchZnXEuPkmRPh7HbSZaLPpMlJCeqYUqW9MAn7 VEgmQKgTli/pZGsFcTEKJ79rVgXZBcTWVl0UH99caaaWWO3iVrsy+jWNZU9f2IwO3GJq I7KQ== X-Forwarded-Encrypted: i=1; AHgh+RpMPAeBp2GlqkaLKy8lbuvddIIvIvEoMlT1hDANzpZNVG0DH4QdLGPU660n4l0KfUuQsNc9xQw9IUIlxm67Kw==@lists.infradead.org X-Gm-Message-State: AOJu0YyVbY0v1drAYgn2F6l+nLewRCT95VSOIrdEmLyutoIc+SrxxjDL xX/1ev/0Chdp4sdAw0GnHHufSwbWD6ymjvTRIUwpYhML6LWMxn05hnN4 X-Gm-Gg: AR+sD12lBV+tmDT8Iv1bcf+teMkbnjHMF/E1CR8XLo1YYPvEgJXWPMVBN/IG77wjT/H cpDoUgTuC2nUXpZ4AniKkigmGKT+QYRYsxb5qvbMU1Hhe6X1TZdz8jW6GudQ9i/JNMASkVkTny+ 2m3xdwtoZAkLGSv/yD0mZiAuzkCfvNvWTdaq752WBIJxl5FvFV+LrISD5PVyNa4DAePZDteNyCH 44uHNxmkHvroRhJJMa6sygZHxikpRQLBV5NSIszj3YEHcsAmcxZPr+kosp5RpbA9NAqsN/nwoF3 iGWtN8+YDR7WBvQC2RPQEOTyYmKveKaPntHCob6kNGZQ60Co558W4OLb+I8zvZej/53IoKYLrJK aMdcbx3nACiEjhAkcuoG015FA9sAJxGKKtL+Tpi5RArGTVQYz/jyrmBpRBEZgVbLt4jEL+JBbsa 2GSS4ONz8rNe8GbDKP1JzFq9yibn95aLgbZh2a1NAyEyKGWJe3If0bN2OIkWSdXz3n6llB0F9Rw yWjOhl3OgJj0TqrQYJO X-Received: by 2002:a17:90b:58c3:b0:389:8f6c:4d59 with SMTP id 98e67ed59e1d1-38fbc4bc3cbmr9364512a91.24.1785766784006; Mon, 03 Aug 2026 07:19:44 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 07:19:43 -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 30/32] clk: mediatek: mt8195: Switch to common probe/remove helpers Date: Mon, 3 Aug 2026 23:16:57 +0900 Message-ID: <20260803141659.559129-31-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_071944_982657_2D82069D X-CRM114-Status: GOOD ( 17.05 ) 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 MT8195 apusys_pll and apmixedsys 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. Note that the topckgen driver is excluded from this conversion because it requires devm_mtk_clk_mux_notifier_register(), which is not currently supported by the common simple probe helper. Since all MT8195 clock drivers can now be built as modules, change Kconfig setting to "tristate". Signed-off-by: Akari Tsuyukusa --- drivers/clk/mediatek/Kconfig | 12 ++-- drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 67 ++++---------------- drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 49 ++------------ 3 files changed, 25 insertions(+), 103 deletions(-) diff --git a/drivers/clk/mediatek/Kconfig b/drivers/clk/mediatek/Kconfig index 6449b77d56ed..ac992cfc6c3e 100644 --- a/drivers/clk/mediatek/Kconfig +++ b/drivers/clk/mediatek/Kconfig @@ -909,13 +909,13 @@ config COMMON_CLK_MT8192_VENCSYS This driver supports MediaTek MT8192 vencsys clocks. config COMMON_CLK_MT8195 - bool "Clock driver for MediaTek MT8195" - depends on ARM64 || COMPILE_TEST - select COMMON_CLK_MEDIATEK + tristate "Clock driver for MediaTek MT8195" + depends on ARM64 || COMPILE_TEST + select COMMON_CLK_MEDIATEK select COMMON_CLK_MEDIATEK_FHCTL - default ARCH_MEDIATEK - help - This driver supports MediaTek MT8195 clocks. + default ARCH_MEDIATEK + help + This driver supports MediaTek MT8195 clocks. config COMMON_CLK_MT8195_APUSYS tristate "Clock driver for MediaTek MT8195 apusys" diff --git a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c index a120c3305547..fc60cd4d9382 100644 --- a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c +++ b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c @@ -161,68 +161,25 @@ static struct mtk_pllfh_data pllfhs[] = { FH(CLK_APMIXED_TVDPLL2, FH_TVDPLL1, 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,mt8195-fhctl", + .pllfhs = pllfhs, + .num_pllfhs = ARRAY_SIZE(pllfhs), +}; + static const struct of_device_id of_match_clk_mt8195_apmixed[] = { { .compatible = "mediatek,mt8195-apmixedsys", }, {} }; MODULE_DEVICE_TABLE(of, of_match_clk_mt8195_apmixed); -static int clk_mt8195_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,mt8195-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_apmixed_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_apmixed_data: - mtk_free_clk_data(clk_data); - return r; -} - -static void clk_mt8195_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_mt8195_apmixed_drv = { - .probe = clk_mt8195_apmixed_probe, - .remove = clk_mt8195_apmixed_remove, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-apmixed", .of_match_table = of_match_clk_mt8195_apmixed, diff --git a/drivers/clk/mediatek/clk-mt8195-apusys_pll.c b/drivers/clk/mediatek/clk-mt8195-apusys_pll.c index a2d98ed58e34..36d358141ecb 100644 --- a/drivers/clk/mediatek/clk-mt8195-apusys_pll.c +++ b/drivers/clk/mediatek/clk-mt8195-apusys_pll.c @@ -56,55 +56,20 @@ static const struct mtk_pll_data apusys_plls[] = { PLL(CLK_APUSYS_PLL_APUPLL2, "apusys_pll_apupll2", 0x038, 0x044, 0x03c, 0x03c), }; -static int clk_mt8195_apusys_pll_probe(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data; - struct device_node *node = pdev->dev.of_node; - int r; - - clk_data = mtk_alloc_clk_data(CLK_APUSYS_PLL_NR_CLK); - if (!clk_data) - return -ENOMEM; - - r = mtk_clk_register_plls(&pdev->dev, apusys_plls, - ARRAY_SIZE(apusys_plls), clk_data); - if (r) - goto free_apusys_pll_data; - - r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (r) - goto unregister_plls; - - platform_set_drvdata(pdev, clk_data); - - return r; - -unregister_plls: - mtk_clk_unregister_plls(apusys_plls, ARRAY_SIZE(apusys_plls), clk_data); -free_apusys_pll_data: - mtk_free_clk_data(clk_data); - return r; -} - -static void clk_mt8195_apusys_pll_remove(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev); - struct device_node *node = pdev->dev.of_node; - - of_clk_del_provider(node); - mtk_clk_unregister_plls(apusys_plls, ARRAY_SIZE(apusys_plls), clk_data); - mtk_free_clk_data(clk_data); -} +static const struct mtk_clk_desc apu_pll_desc = { + .plls = apusys_plls, + .num_plls = ARRAY_SIZE(apusys_plls), +}; static const struct of_device_id of_match_clk_mt8195_apusys_pll[] = { - { .compatible = "mediatek,mt8195-apusys_pll", }, + { .compatible = "mediatek,mt8195-apusys_pll", .data = &apu_pll_desc }, {} }; MODULE_DEVICE_TABLE(of, of_match_clk_mt8195_apusys_pll); static struct platform_driver clk_mt8195_apusys_pll_drv = { - .probe = clk_mt8195_apusys_pll_probe, - .remove = clk_mt8195_apusys_pll_remove, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt8195-apusys_pll", .of_match_table = of_match_clk_mt8195_apusys_pll, -- 2.55.0