From nobody Fri Apr 10 02:34:23 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 E16523D1CAE for ; Wed, 4 Mar 2026 18:11:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647903; cv=none; b=bePFSMQeCOzrwlXDMuQAfIJpJz2uHY5seZoJaQFlZoO+v9q8ZBpYViU76r1XYUdW/T+1ySn+189i+829+bCDDm6bhRosymrRjaq1rS5ewXqumZE3W1yCEv6Txp2z9J8G9lWuyVsE9TOKmSC9MdNJkgUUL55V44ELj7FlKVAh+3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647903; c=relaxed/simple; bh=ihIXHqqluv5bizDOEaQvw/6UyZnqqzM48Pjhmaj1tQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tBe0E1n2CycyULzJ7PyVUBPTcUq2CrtoQYeZ1v3k4KSRL2CWeE+jBebPrv5GcvhAj0mGuIMEozjTzrrLxHs0qBV7jS0j9r0SiqY/RT9f/+/MUP25wEjrvmVdv4TowDPUrYHtjJCpTrzY0zQ2dv/MpVKm2vDRUZnoJKPRS4ElPJA= 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=AK8fbiql; arc=none smtp.client-ip=209.85.210.174 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="AK8fbiql" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-829759ca646so465016b3a.2 for ; Wed, 04 Mar 2026 10:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772647900; x=1773252700; 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; bh=/F7XmH5/hs11BL5Bv9gfwXPkKTxvFijq4nvY+SwIm9w=; b=AK8fbiqlRkZA5RLl3v+qTaQCMAbbnEGCCU5OT5x2dTAK0GrH0NGlLGbm6zcnqHuhhR w5juRm8OKu8SNBTyb4jQmLR52vFLjOrdJ1vaaxxb2Wc/1Jo8bvKukONZStUWsJ63D/LA yGJOzK8F3McHUfsVQkPkF4z9L+o78zY3cYPkMQA6pVO1nS6wWGf0+73yKpr8LI4H7FKv swfzDP9EF4/zoVq6gt36J/2rlGnWQK9CNbQmYx3TnmC15fus5HVEsXOwbHbMTT9nrIdS vsT7CoaASu5EgSaRQqpPM0GtLEkD3hKNkfUjDC2QciuSHXQCeDk/zIm/A4ADjKe5AW6V jMCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772647900; x=1773252700; 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; bh=/F7XmH5/hs11BL5Bv9gfwXPkKTxvFijq4nvY+SwIm9w=; b=rHmE2vbGD19j3kz/iGE97FP9N0BEBRYHRwPCOYBhI2xo2vTEnu1hdBH+NlO/jzyDa1 GqgGcOKMzEM480tG7Co49u1asw/miSpCgumhci6EBMLIHT0kzu4zBCEGVYNmVB81inCt XBVuzQb9T1TL7gG0BHu/za9h+f28Hx+nHgzNx2jr7IQt/+xxG6uuXSerc0J1bCv7TQ/P opAsrmpo6VgAzWsiAj9JijHXXR0dfe2geervHNyEIoXL/WQY9HkNu5oSVVmfHsiJX5ig ZjPE/a9NI3q0fefWyBXF39Tgg0JAdZobOjbE3JJg2YoVzSxYRVu8IEiQc5OsTRUspeUR aTgw== X-Forwarded-Encrypted: i=1; AJvYcCXUfjfDl/1NvA0xkRM1urht7xNyFWBABflDZrXZO7Xn57cBioS+wGDxlYOa7h3pJKalIysFovl26pzO+f4=@vger.kernel.org X-Gm-Message-State: AOJu0YwoIqczyiTtW+tD/8zwjsN0eEO+slupQylfzorMc4Q2lzde+ySb 2iOJNdYqXkQSwF+aokecJmdZciIhqHUTIFnp+I06nN8HiTB47tNkge7t X-Gm-Gg: ATEYQzzD4jxKyyf379PCflcYTpk8C360NG+iDTmrsQN36aNpFh/taq5XznFEgBIMbeQ 9IbXYdhP/YyIQWI2J0+EE0ct/FIn51n6It4n5A0X3Z064iT5W8Twfpe/cZtGoNhwZt/MzvwEQut btrq8OlC+aFtJXco3vg86CF3kXs6neqsA99COgZq4xpr620UCRRYsUHPgBOFkzJv5bRsm/gqWFZ QEcvnADkIOm18jWWRN9adhWSmzAIDQDZOHNjEf/9+FLC/0HlzBLUrAEqRf6T8e0fvRejbK5tCVI xhgid4IfKEvSFjBqpmUCXB8Nov74u89IQ2p42xZ/V0IENq9IM1Vh6I3ke/ZL3/9n9wW4gDFzK+Y iIhwYwOwqifhuOcx5CUr/aHwXYyfjK3NT62ka8IPU64JZae1wvi/4hJ97Mh+8PRq9CTJjxef7nR ovez8kN1VpIdavqdGSC2AcR/IRoaFAxo5va9wr2nvFGxjVNwcZ90PcLLmEEcC3XggIaZoAjX+wl UWU0Ns= X-Received: by 2002:a05:6a00:2191:b0:81f:4675:c2a6 with SMTP id d2e1a72fcca58-82972b7584amr2427606b3a.2.1772647900198; Wed, 04 Mar 2026 10:11:40 -0800 (PST) Received: from buffalo-ssd.taila54753.ts.net (M014013071096.v4.enabler.ne.jp. [14.13.71.96]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829713825efsm2503835b3a.51.2026.03.04.10.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 10:11:39 -0800 (PST) From: Akari Tsuyukusa To: mturquette@baylibre.com, sboyd@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Akari Tsuyukusa Subject: [PATCH 2/3] clk: mediatek: mt6795-infracfg: Switch to common probe/remove helpers Date: Thu, 5 Mar 2026 03:10:23 +0900 Message-ID: <20260304181024.738391-3-akkun11.open@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260304181024.738391-1-akkun11.open@gmail.com> References: <20260304181024.738391-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: quoted-printable Content-Type: text/plain; charset="utf-8" The MT6795 infracfg driver can use the MediaTek clock framework's common initialization sequence. Reduce the 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-mt6795-infracfg.c | 70 ++++------------------ 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt6795-infracfg.c b/drivers/clk/media= tek/clk-mt6795-infracfg.c index e4559569f5b0..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,74 +76,27 @@ static const struct mtk_clk_rst_desc clk_rst_desc =3D { .rst_idx_map_nr =3D ARRAY_SIZE(infra_ao_idx_map), }; =20 +static const struct mtk_clk_desc infra_desc =3D { + .clks =3D infra_gates, + .num_clks =3D ARRAY_SIZE(infra_gates), + .cpumuxes =3D cpu_muxes, + .num_cpumuxes =3D ARRAY_SIZE(cpu_muxes), + .rst_desc =3D &clk_rst_desc, +}; + static const struct of_device_id of_match_clk_mt6795_infracfg[] =3D { - { .compatible =3D "mediatek,mt6795-infracfg" }, + { .compatible =3D "mediatek,mt6795-infracfg", .data =3D &infra_desc }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_match_clk_mt6795_infracfg); =20 -static int clk_mt6795_infracfg_probe(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data; - struct device_node *node =3D pdev->dev.of_node; - void __iomem *base; - int ret; - - base =3D devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(base)) - return PTR_ERR(base); - - clk_data =3D mtk_alloc_clk_data(CLK_INFRA_NR_CLK); - if (!clk_data) - return -ENOMEM; - - ret =3D mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc); - if (ret) - goto free_clk_data; - - ret =3D mtk_clk_register_gates(&pdev->dev, node, infra_gates, - ARRAY_SIZE(infra_gates), clk_data); - if (ret) - goto free_clk_data; - - ret =3D mtk_clk_register_cpumuxes(&pdev->dev, node, cpu_muxes, - ARRAY_SIZE(cpu_muxes), clk_data); - if (ret) - goto unregister_gates; - - ret =3D of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (ret) - goto unregister_cpumuxes; - - 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 =3D pdev->dev.of_node; - struct clk_hw_onecell_data *clk_data =3D 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 =3D { .driver =3D { .name =3D "clk-mt6795-infracfg", .of_match_table =3D of_match_clk_mt6795_infracfg, }, - .probe =3D clk_mt6795_infracfg_probe, - .remove =3D clk_mt6795_infracfg_remove, + .probe =3D mtk_clk_simple_probe, + .remove =3D mtk_clk_simple_remove, }; module_platform_driver(clk_mt6795_infracfg_drv); =20 --=20 2.52.0