From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 319654322F9 for ; Mon, 3 Aug 2026 14:19:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766781; cv=none; b=fwy8gcHgVfCMSSGk38HsZcj3wKiZreyTeR9gLZDZQhWXnVbQaxH/NbJr2Ad8OBRMQrsB4OomWySauD1KEpaLWOG4AdPQfw7ZsGr4diTvbeRsymh9ojhTadaErH/s1I2yqeO8kGf+pIgDErZe/WhEEhqp8o+QcAS+2PS3iPFub3M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766781; c=relaxed/simple; bh=9DC6OuxRhS6bV+aafS5/ocz69vO2xPsOdqeLUmXIr6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XsnrOO8xytpBDMQ4vTxrTZWEsBHukePdq+SRaufAnK/rczVAk156r0gVzkWcYt06hAdCRsmbtpKa84jrVhsS3aWIJOkZV5V31YokY91rQ0dxdKYINw5zpKsSLWp0XHogqkGdvFfoF9A6+aWT74gjzofNMrJwVdaIaGkjqM7MP6w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=n8RVM4Bc; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n8RVM4Bc" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-38e88b60121so2605182a91.3 for ; Mon, 03 Aug 2026 07:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766779; x=1786371579; darn=vger.kernel.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=n8RVM4BcHYe85scpxfqc26BKe3RTLidaVwZFlkBUy4JSAE9v51F+VSGRbJmwX2JT2p HiJ9O3kNBlgcIELiWej/NtsuVt2TctwCHSkKm8kaPmUISz5hCsZGg63ip5z6w3keoQ02 +xwKZZQYVi7tLN/3Cd6OvT9bbtv1ILKeg8tzsaMrZwMUyliHDzsTaTHDqVbLMaJ7DeQb znfQshGQxN8ZkBKkrCh/DPFqYwb7HljOt6drQHmi7iKIIPHLHYXJmTb7crMKcnB0XjMQ wJubPGZci2wpndosQlnf4hf+bpBoPyTWLCYx/CbsV/goCLgtZrqSRJNDzR48P17TNs4n J+DA== 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=WdlaD/8SlvSZPqicnJjmrMGfD/RgqDUtO9/l69pi3g73jm9GSibaWyBtDYNc/E4gRY +vB9cXNaQ/Desjgba26q8QhoSyQcjCgklhT6IyuSgRrQ2QK+LGQQEhueLvUp1qLwcCkx /O+Hxb7dWaYk/GF5EgDTc7UNRGKDncu4o0Rl19wbxt8+z6crx2noIjclPgHaC1/kTgpB r+0YBHZVwNaJ0I1bQoDPErHgIvm4MZT2t2hxNKyF5thRRLBWzzXBvw/2sC3SLiJBJH20 A03tmn0LThVZYPJqmndZeOwjfcFUUZzL/H0NA8cTpSohqRGu4uovVd5roZ1DpJK9xQ8i glSw== X-Forwarded-Encrypted: i=1; AHgh+RrXv7MuKr/toIXcxi4ux3qfiQME1r17aixbZtdsCry14joT8IGeFSTYMG55Plu8h81NkoSdldPtVaBBifg=@vger.kernel.org X-Gm-Message-State: AOJu0YzHPdhNjfAKWBcnDINBQThNKu2eARZIdYOiPyEmIN9h1ULK37YA wJsBaZRMbypbaN15cNcldx1h20sMKDbvwlOaZqChQ3Cu8ZqXlixdjD6d X-Gm-Gg: AR+sD12T6UhD56iuZOsfsWjxayck/iuu7TmUgeKeI6zHEU/PUqxwaMQibousPH7lzfE CkKjpwg1hkVrWipEFdpfppmCzlK8SSc8rXQhi3VV/2u9BU2FOcdhZjDM54znL8fDPd9LJbicI22 VDWQBrVWvQ15V/NXQPY25kcXsMPDuk6xFfmcvaStGceS85TIsHuDLAu8+PyRcXVcdognC4Fqc1t rVevld6xgtld4de8A95EFEmeFgh+fEk4Ly/5PiPLb7xttUJwIwpeoGxEFKA61cIy9ocLI9+IRme 5KhvXjADn7O/g81uBC65DsYb39D8Kznl1FLBDrDzyP2VTzkdxnqbGukLo+JangoN7QoEZ1gO3sB 2BXXdyAnTmqrmbxzPXOLT8YSPisAODggFzagjNLj/WXZkg4gi6734WPlT+tuFpIuRh160uXfTLV 1hWmphZraWlEs4QuSFGyykOGONR5O2hBBEl1wl9YInd0z0+CxHq2WFCZziYHzMTAkzhOxkxoEfb clsNAc302Cwns4sus65 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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