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 BC2A4CC6B16 for ; Tue, 13 Oct 2026 15:20:24 +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=EpB1pSYzU/DFyffmKgLpdYkjUU97msISlGmPAchVX0s=; b=AZcdKzLuhHj3/DUxNJircR6YQj o+O7FfzMUeJjZ/2hJjSRMbF4lCf/MSSL12Ptsc59KX0yqumdZDLeBHrsBRySNkODlaHAGdETL55En 101O7K1RhbfqviLdffEaVsUX4/skvLR1Uqlg7j9QguDyuZhBjkzr//4nTH51FWwQLMN4zrAcgOOH+ q3O1VthMsLyErHuOq8K1P3WJKiOWXcjno7UV+LuflANqfErKu1ac5l+QY5mZt+e4l2kfKufufe/+4 I1eFfKzClaWP0m9uQh3vmmZMPQ+xZ/QeuLTpjIvjvoy3fvihiQ450bahazs81h5odt5yfWitQtCJ+ le2Fpu2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xGeIY-0000000DHoG-22si; Tue, 13 Oct 2026 15:20:14 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xGeII-0000000DHS3-0CGV for linux-arm-kernel@lists.infradead.org; Tue, 13 Oct 2026 15:20:07 +0000 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-3ab41538192so2243024a91.0 for ; Tue, 13 Oct 2026 08:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791904797; x=1792509597; 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=EpB1pSYzU/DFyffmKgLpdYkjUU97msISlGmPAchVX0s=; b=aU9vs8P0nR6XT7NL//XOj5sjvaSYsEhxiYu66PtYSsU32MEtL92HlkLyXFFlHieeAJ iLmb1lYF47MTYZMvl1geKdLExFvh8B5U+atP2Xia04gmaiyG7o7JpMNar92POL0lz+p/ caMEou8cvwoZxu3cnVR9wPCrglvVq8sis0YTCHs09HhqXICiztO7ITz8f8NJIUuT/Ft6 uz/NxBDw3cBnpskDqQtcMIKHWk7vGsTjM+GgaZqDAOrw7oHEPdWaOvmgwn72x4041JtH FvwRwYZ4b3BjdJ8DEDc3AnJ9HhFi25DACZR116U92GsKuyOVkGdKt/eNOIwsvypZzc4S SQuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791904797; x=1792509597; 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=EpB1pSYzU/DFyffmKgLpdYkjUU97msISlGmPAchVX0s=; b=BiouZ9L7LuzM/v8Bt+CnZn8DfTHHg522i2fRV/4LHDBqzdRMkJ0cLjb+qMhoV4htoP Yxh7TO2BRAnW1qC1i7wahSquDJiXawjJbH/wJ1sNWHeU+IhOXPg9QN6uWutoeZFlJdoR nUZuc/SuWujw7bihoaetavtKRY599D9PM2Al7qrZMgc+xsh5n07s9vxGmwqg0g98qVjZ 06MkC4+q1zMjNOcY7s22uXFYsvt2ATE3T90g4ZzfxvaVkpeHrJ+2aJNbBIi3+87Jlsby OOd+lRQ074dHbEaGewIgG0v3v5qgYUd6tn/IY7nMguYAEyfZLb3zk6kkmqw1rofLlKrC 7C/A== X-Forwarded-Encrypted: i=1; AKwUvBxClOjQV1BapJJwXBXBigc8ADyWztMGnLLzPEpdDxLMWrZOi7hQGwhbjSJffI/AiH05bcppTXqTJgGpBFm5fsF2@lists.infradead.org X-Gm-Message-State: AFq9FYIv4jZLca8phITdd2x5cxzMeLTfroXxsgp7fCteXFWEczSu9wB+ VHjnJG3CPV76+LvRQz0DPfcjIguidH2wiGbF8UrK8DrR3H3EGylf9Ey4 X-Gm-Gg: AYBFou2AUTg8DaFezclruT+4WtSapoUDMizwItrCZlOlMyoF3iPRR2PeZWbdpc4HMM2 RSC1duiqEiyfuk6pywPLFWXxwqTcPI9CnqcUBm7rZ0qXBBj3wRe2cEbPyAmQv/0u/lHgljba5ov IazNe7AHywX4l5qxoagM4N/jMENOlD1TA3HvN4htB6bQXfQ80JCeoelUcJeQFry0bfwph7TUJvc zqgbggxl+rO4rXwPnj4bM1hOJ96ZaWjJpM8vW9Gy4cZpnyvROtI48h3+5bZg8JUCNM2v4nXTGhr Z1ppQ8SjfhvRsfyRub7tslEWrZWIIyepbTzCby7IowrLbN50DbHdWJ6ul/Xk8KJoBAuwaJlfZDW PNl+7xL8d350484V9FGYgW5jn4Q8qVE60d5iBQeuxnqPlBEV8EOwNTglfxd9QtvJQN9REpC4cO7 D3Zigqfc7O18a6EYtvPGGTF7dB/iQSdvqOsK7fYlrN24KYXjNvG9Nz2e0Vg45YbU9c+Ilepl1Yt I5vSXlAlIgJRCYzAdWYrzcz1fJt X-Received: by 2002:a17:90b:3b84:b0:3ab:c80:9370 with SMTP id 98e67ed59e1d1-3ab3a736596mr9866608a91.20.1791904796990; Tue, 13 Oct 2026 08:19:56 -0700 (PDT) Received: from buffalo-ssd.taila54753.ts.net ([240b:253:4760:f400:1ebf:ceff:fe7f:5e0b]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cd3da04596dsm5759888a12.29.2026.10.13.08.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2026 08:19:56 -0700 (PDT) From: Akari Tsuyukusa To: Brian Masney , Jerome Brunet , Matthias Brugger , AngeloGioacchino Del Regno , Yassine Oudjana , Richard Cochran Cc: Chen-Yu Tsai , Bartosz Golaszewski , Kees Cook , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20=28The=20Capable=20Hub=29?= , Danilo Krummrich , Nicolas Frattaroli , Bjorn Helgaas , Takashi Sakamoto , Haotian Zhang , Miles Chen , Sam Shih , Daniel Golle , Chun-Jie Chen , Laura Nao , =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?= , 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), Akari Tsuyukusa Subject: [PATCH v2 20/35] clk: mediatek: mt6795: Switch to common probe/remove helpers Date: Wed, 14 Oct 2026 00:17:19 +0900 Message-ID: <20261013151734.3177690-21-akkun11.open@gmail.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013151734.3177690-1-akkun11.open@gmail.com> References: <20261013151734.3177690-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-20261013_081958_145848_D43E8BCA X-CRM114-Status: GOOD ( 18.98 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The MT6795 infracfg driver previously needed custom probe/remove callbacks to register CPU muxes, which were not supported by the common helpers. With CPU mux support now available, infracfg can use mtk_clk_simple_probe() and mtk_clk_simple_remove(). The pericfg driver can also use the common helpers, which already support its gate and composite clocks. Keep the apmixedsys driver unchanged because it requires ref2usb_tx clock handling, which is not yet supported by the common helpers. Signed-off-by: Akari Tsuyukusa --- Changes in v2: - Improvement of commit messages --- drivers/clk/mediatek/clk-mt6795-infracfg.c | 72 ++++----------------- drivers/clk/mediatek/clk-mt6795-pericfg.c | 73 ++++------------------ 2 files changed, 23 insertions(+), 122 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt6795-infracfg.c b/drivers/clk/mediatek/clk-mt6795-infracfg.c index 914bb069aa85..6aefc577ece5 100644 --- a/drivers/clk/mediatek/clk-mt6795-infracfg.c +++ b/drivers/clk/mediatek/clk-mt6795-infracfg.c @@ -8,7 +8,6 @@ #include #include #include -#include "clk-cpumux.h" #include "clk-gate.h" #include "clk-mtk.h" #include "reset.h" @@ -77,76 +76,27 @@ static const struct mtk_clk_rst_desc clk_rst_desc = { .rst_idx_map_nr = ARRAY_SIZE(infra_ao_idx_map), }; +static const struct mtk_clk_desc infra_desc = { + .clks = infra_gates, + .num_clks = ARRAY_SIZE(infra_gates), + .cpumuxes = cpu_muxes, + .num_cpumuxes = ARRAY_SIZE(cpu_muxes), + .rst_desc = &clk_rst_desc, +}; + static const struct of_device_id of_match_clk_mt6795_infracfg[] = { - { .compatible = "mediatek,mt6795-infracfg" }, + { .compatible = "mediatek,mt6795-infracfg", .data = &infra_desc }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_match_clk_mt6795_infracfg); -static int clk_mt6795_infracfg_probe(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data; - struct device_node *node = pdev->dev.of_node; - void __iomem *base; - int ret; - - base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(base)) - return PTR_ERR(base); - - clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK); - if (!clk_data) - return -ENOMEM; - - ret = mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc); - if (ret) - goto free_clk_data; - - ret = mtk_clk_register_gates(&pdev->dev, node, infra_gates, - ARRAY_SIZE(infra_gates), clk_data); - if (ret) - goto free_clk_data; - - ret = mtk_clk_register_cpumuxes(&pdev->dev, node, cpu_muxes, - ARRAY_SIZE(cpu_muxes), clk_data); - if (ret) - goto unregister_gates; - - ret = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (ret) - goto unregister_cpumuxes; - - platform_set_drvdata(pdev, clk_data); - - return 0; - -unregister_cpumuxes: - mtk_clk_unregister_cpumuxes(cpu_muxes, ARRAY_SIZE(cpu_muxes), clk_data); -unregister_gates: - mtk_clk_unregister_gates(infra_gates, ARRAY_SIZE(infra_gates), clk_data); -free_clk_data: - mtk_free_clk_data(clk_data); - return ret; -} - -static void clk_mt6795_infracfg_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_cpumuxes(cpu_muxes, ARRAY_SIZE(cpu_muxes), clk_data); - mtk_clk_unregister_gates(infra_gates, ARRAY_SIZE(infra_gates), clk_data); - mtk_free_clk_data(clk_data); -} - static struct platform_driver clk_mt6795_infracfg_drv = { .driver = { .name = "clk-mt6795-infracfg", .of_match_table = of_match_clk_mt6795_infracfg, }, - .probe = clk_mt6795_infracfg_probe, - .remove = clk_mt6795_infracfg_remove, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, }; module_platform_driver(clk_mt6795_infracfg_drv); diff --git a/drivers/clk/mediatek/clk-mt6795-pericfg.c b/drivers/clk/mediatek/clk-mt6795-pericfg.c index 27d0ef7d7b2f..53c79e830b6a 100644 --- a/drivers/clk/mediatek/clk-mt6795-pericfg.c +++ b/drivers/clk/mediatek/clk-mt6795-pericfg.c @@ -85,77 +85,28 @@ static const struct mtk_clk_rst_desc clk_rst_desc = { .rst_idx_map_nr = ARRAY_SIZE(peri_idx_map), }; +static const struct mtk_clk_desc pericfg_desc = { + .clks = peri_gates, + .num_clks = ARRAY_SIZE(peri_gates), + .composite_clks = peri_clks, + .num_composite_clks = ARRAY_SIZE(peri_clks), + .rst_desc = &clk_rst_desc, + .clk_lock = &mt6795_peri_clk_lock, +}; + static const struct of_device_id of_match_clk_mt6795_pericfg[] = { - { .compatible = "mediatek,mt6795-pericfg" }, + { .compatible = "mediatek,mt6795-pericfg", .data = &pericfg_desc }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_match_clk_mt6795_pericfg); -static int clk_mt6795_pericfg_probe(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data; - struct device_node *node = pdev->dev.of_node; - void __iomem *base; - int ret; - - base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(base)) - return PTR_ERR(base); - - clk_data = mtk_alloc_clk_data(CLK_PERI_NR_CLK); - if (!clk_data) - return -ENOMEM; - - ret = mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc); - if (ret) - goto free_clk_data; - - ret = mtk_clk_register_gates(&pdev->dev, node, peri_gates, - ARRAY_SIZE(peri_gates), clk_data); - if (ret) - goto free_clk_data; - - ret = mtk_clk_register_composites(&pdev->dev, peri_clks, - ARRAY_SIZE(peri_clks), base, - &mt6795_peri_clk_lock, clk_data); - if (ret) - goto unregister_gates; - - ret = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (ret) - goto unregister_composites; - - platform_set_drvdata(pdev, clk_data); - - return 0; - -unregister_composites: - mtk_clk_unregister_composites(peri_clks, ARRAY_SIZE(peri_clks), clk_data); -unregister_gates: - mtk_clk_unregister_gates(peri_gates, ARRAY_SIZE(peri_gates), clk_data); -free_clk_data: - mtk_free_clk_data(clk_data); - return ret; -} - -static void clk_mt6795_pericfg_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_composites(peri_clks, ARRAY_SIZE(peri_clks), clk_data); - mtk_clk_unregister_gates(peri_gates, ARRAY_SIZE(peri_gates), clk_data); - mtk_free_clk_data(clk_data); -} - static struct platform_driver clk_mt6795_pericfg_drv = { .driver = { .name = "clk-mt6795-pericfg", .of_match_table = of_match_clk_mt6795_pericfg, }, - .probe = clk_mt6795_pericfg_probe, - .remove = clk_mt6795_pericfg_remove, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, }; module_platform_driver(clk_mt6795_pericfg_drv); -- 2.56.0