From nobody Fri Apr 10 00:55:56 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 60E1C379960 for ; Wed, 4 Mar 2026 18:11:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647899; cv=none; b=bp1oR/5CEEFX6b4jSC4I7v0AkmOm5OWRRilFE3BoHWqIaHyuysWRTB+6Il4QFXmK4dIM7R4lkam4MsXSEHyqc2TodHyID7lgA51d3O8Dn9HK3T/aKm3MjwG6c8C/OiZ/+9MElIR+Tn/F+brZ/7DcIqVZ7AemJRe0HytKjiU6fxw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647899; c=relaxed/simple; bh=JOs6Hru9e1pyzmoSC+Fu2HzEj09qTOnEBQH8YB/TK0A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KpijVcFHtXcpL/+xB/B7dI9TVTzLkDnA9OjC91wyJRFA2JvJjljq7n0xbt/1PAO6x8xLDhNHbp2qUtljjNDd/BkTtfryekoKoLtUZp8Jf599NSEAYZEJaQrkaPbZPwRSqMz4uCy5Yxhjlw7DTvcEPPjmpiX1ZZgE4BQDD/UpLSg= 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=NiMwoFpe; arc=none smtp.client-ip=209.85.210.171 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="NiMwoFpe" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-824b05d2786so5762446b3a.2 for ; Wed, 04 Mar 2026 10:11:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772647898; x=1773252698; 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=IbrHSPPxep6X+vivH1+ezOTNFT57/EKHgyG9LJdna2A=; b=NiMwoFpevUQPMXIoE/7+Sju6sxscBm6LnsUnnLKdmFu9D1/4UKXiiX5T0z89/iI62z iLBnUmc9G9etO3w+S7UKLue9an84ToOWz6nyODK7K43u6s9QPjC6oroGUSCrnfbx1ri4 /J+QFdnVPok7HMYR3zJt0cyHXfQvW3k7N1ppdJsE5+gZGddMbpo1CiJd1JusKj4pUFQ3 gHxbaXN6xr3vZRO5g7suXOgAf40j+WytciyMpOnBlKVoTCL4i7hHt0NH7okp3TscTYon XXmI0QOTaZgxZU0HaSz4wxriKinx7h4Huk4fhJX1k4JM09IY8GVituS6TXJdDFx46Ykd N/cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772647898; x=1773252698; 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=IbrHSPPxep6X+vivH1+ezOTNFT57/EKHgyG9LJdna2A=; b=dYcQj8SB06IBlfLzC44ik7kk4LykvrvAfMQpU5+bI9Fp7GCU10NyqaWyDXJxVVyZjk UfDODJgVYTkAL95pEAsiXTO/zQPvI2LQ5mS97v59IyqpyIC0qELWD8mdgtJLaWym9aac 4IF8yi+Nw00VGTjLKpt5Z7oukIx7Pnpb17gb6LZrP2O23NTmkRfX2VKWcuKSAbct7xEG QaKT/3mV8kyYvB45+9RmF+BCWx+kRngQv3Ff+/l0ck0O6XH4yo3L++nADiIEd46MQhUl M8NR0SslYU2kPnr5ZLbOjacXWwiOwobmKKaSDrWxCH702at9dO9yl3dqFaf3FC5WEOI0 RITg== X-Forwarded-Encrypted: i=1; AJvYcCW8COkVpHJItsOfx/0N3g97zegUIy5AT2f0oYGtwKw4hgUXoZv+8q5YJ631iKtgi/fPA106Z5ymp8cjwXo=@vger.kernel.org X-Gm-Message-State: AOJu0Yx00QGJgbIIcmYgRbqP7jgkve10KdiK5zsWXqcEt9ozX0cklSRP Jq+Ew9idjD6hJFFDqpud02WXaxprVlfLfCgmWgpdTqH3OvBxD4KS6+CN X-Gm-Gg: ATEYQzx0U1qvo4UfaUQjccj02kMZizdSD8inNU/iUzigKFaifdIcLp/qR1xvWuharle QE/uqzMfev8XAgTkZt+dddBWzNJ2fNEQtqEWQyMDqo4gvsse5zzOQvy0AkqNm1QMP1fX3OPvh1n ucDFIbAkgaZXLwglTeQH2ZQfeI17q8ivPuz3/9dT6eAp8LfsJ3M5WYrcLdu5kptLj0S7aEWmEO+ 3Ib68rbV4h5SR7cYEdQ/v3eZOLnHznxXx7EPPhQj8p3Qw9iZco3ML+Qpn5ohh348c2C7B1hNGlm NgQokR+XwLXeJxQfMFd2LaIn5CfDoEGxtfKdN31BPxbYvKBbmj5SqBTc8dY4j2mog9uka/IOSzH 5sn0fhTkXrxefjLC13RSpvxgAdPV/dJGYiXc9aiQAGdyroxGnq4JwaECaejBDXYsUOEDQMskkZW ADuYghMD44PBGZ5kz1EwF13V9EBDH0OPVdbs2nQKgXBfHzV4zFChmR1B4uGEJjEpGaehz69cK0g EH9A91EM+dslFWLfQ== X-Received: by 2002:a05:6a00:130f:b0:81e:2bca:d133 with SMTP id d2e1a72fcca58-82972b49983mr2518364b3a.24.1772647897597; Wed, 04 Mar 2026 10:11:37 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 10:11:32 -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 1/3] clk: mediatek: clk-mtk: Add cpumux support to common probe/remove helpers Date: Thu, 5 Mar 2026 03:10:22 +0900 Message-ID: <20260304181024.738391-2-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" Extend __mtk_clk_simple_probe() and __mtk_clk_simple_remove() to support cpumux clocks. This reduces boilerplate code in drivers for SoCs that require cpumux registration, such as mt6795-infracfg. Signed-off-by: Akari Tsuyukusa Reviewed-by: Chen-Yu Tsai --- drivers/clk/mediatek/clk-mtk.c | 18 +++++++++++++++++- drivers/clk/mediatek/clk-mtk.h | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 3dfdd3a422f8..8148c21e6099 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -19,6 +19,7 @@ #include "clk-mtk.h" #include "clk-gate.h" #include "clk-mux.h" +#include "clk-cpumux.h" =20 const struct mtk_gate_regs cg_regs_dummy =3D { 0, 0, 0 }; EXPORT_SYMBOL_GPL(cg_regs_dummy); @@ -513,6 +514,7 @@ static int __mtk_clk_simple_probe(struct platform_devic= e *pdev, num_clks =3D mcd->num_clks + mcd->num_composite_clks; num_clks +=3D mcd->num_fixed_clks + mcd->num_factor_clks; num_clks +=3D mcd->num_mux_clks + mcd->num_divider_clks; + num_clks +=3D mcd->num_cpumuxes; =20 clk_data =3D mtk_alloc_clk_data(num_clks); if (!clk_data) { @@ -542,6 +544,13 @@ static int __mtk_clk_simple_probe(struct platform_devi= ce *pdev, goto unregister_factors; } =20 + if (mcd->cpumuxes) { + r =3D mtk_clk_register_cpumuxes(&pdev->dev, node, mcd->cpumuxes, + mcd->num_cpumuxes, clk_data); + if (r) + goto unregister_muxes; + } + if (mcd->composite_clks) { /* We don't check composite_lock because it's optional */ r =3D mtk_clk_register_composites(&pdev->dev, @@ -549,7 +558,7 @@ static int __mtk_clk_simple_probe(struct platform_devic= e *pdev, mcd->num_composite_clks, base, mcd->clk_lock, clk_data); if (r) - goto unregister_muxes; + goto unregister_cpumuxes; } =20 if (mcd->divider_clks) { @@ -605,6 +614,10 @@ static int __mtk_clk_simple_probe(struct platform_devi= ce *pdev, if (mcd->composite_clks) mtk_clk_unregister_composites(mcd->composite_clks, mcd->num_composite_clks, clk_data); +unregister_cpumuxes: + if (mcd->cpumuxes) + mtk_clk_unregister_cpumuxes(mcd->cpumuxes, + mcd->num_cpumuxes, clk_data); unregister_muxes: if (mcd->mux_clks) mtk_clk_unregister_muxes(mcd->mux_clks, @@ -643,6 +656,9 @@ static void __mtk_clk_simple_remove(struct platform_dev= ice *pdev, if (mcd->composite_clks) mtk_clk_unregister_composites(mcd->composite_clks, mcd->num_composite_clks, clk_data); + if (mcd->cpumuxes) + mtk_clk_unregister_cpumuxes(mcd->cpumuxes, + mcd->num_cpumuxes, clk_data); if (mcd->mux_clks) mtk_clk_unregister_muxes(mcd->mux_clks, mcd->num_mux_clks, clk_data); diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index 5417b9264e6d..02fab4b166f2 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -252,6 +252,8 @@ struct mtk_clk_desc { size_t num_factor_clks; const struct mtk_mux *mux_clks; size_t num_mux_clks; + const struct mtk_composite *cpumuxes; + size_t num_cpumuxes; const struct mtk_clk_rst_desc *rst_desc; spinlock_t *clk_lock; bool shared_io; --=20 2.52.0 From nobody Fri Apr 10 00:55:56 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 From nobody Fri Apr 10 00:55:56 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 827F53CB2E4 for ; Wed, 4 Mar 2026 18:11:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647908; cv=none; b=ZiIX9994BxhXqH1UQEqM3a/2JY9fk+BWcML5KfRcBityPLDZUVEJ585rHSQBRZ39uvCSG0I7oGqYBzBghLSyiVO4/LZrlIG/kbmLdnUv7/sDcrP3U7/IlUuIOLN3GuYhKT7V/GlofNv0a9wQCWs7HIy9uWE4hxnKDo8EYosqS5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772647908; c=relaxed/simple; bh=nWy811gaDh3wRu1x8s4UcwtA1YzqURN2rSvxeSK1e2w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q7KjWJ/H7NgXWYkaXbZ8pB4vaEcCfF+osTZdkraUSXC8atFLY/CLJ4gde90fRNkSPQmLjTxhT7tcxMawTzXB3sMVsuEEKZgMh8ZsWfIu2CRiBvA1MDTyYzF7yh6qIUDigtfbSs6Ps7YaYoFlvIexVPbFfS4jdDYyIOFia0+vZxU= 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=jEeaGp3t; arc=none smtp.client-ip=209.85.210.172 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="jEeaGp3t" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-827390e8a3cso4673766b3a.0 for ; Wed, 04 Mar 2026 10:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772647907; x=1773252707; 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=GnLN33Ifloh+UfyT9Xr8GDknKJnwUYvHC0fyQTp1f3s=; b=jEeaGp3tkP6IdFi1iFEFMjhWjnGpuFInn/5uimiiRinkc3qrRMAyEIP6Eabuq2N9uR 2qhxx1YvKz46eek2lrHdrIc74mSyBAzyOEKCS5VzjvfCiYuQDMX5a3kw8NYaY11bt/lJ NN+9LW61YudgFuDk9G4+vv0HJDJm98yBLeuJ4vyY7EvZSXOlHUJeNsS6FYrFHe/oM7s0 3bk8D6A4IULyi848qNY0hDSko/eVvXTrJ08ViD/YKz06RpibFMChDazzEWb3OPFGHsg0 UFnG+6WC1aWPxEychoTsQMPcdBaTCBnuZXoeKDmGMWIgeW1iHOXxX9dKLxje8gfvseK7 H4JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772647907; x=1773252707; 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=GnLN33Ifloh+UfyT9Xr8GDknKJnwUYvHC0fyQTp1f3s=; b=L4T2FGWRFmLRNdlGONR338W1QYMfqhO6IGKbCjD10SZc326ZEYgmDhTKfN2VD8piS+ YZcuufw1I/uJRO8ToboLeoHbfwI200x795yoLSqEh6pq2rXYVSCAFrWR0SLcmVuj9+2y jPLLPgHPzDUbOIFkK6nHvzweUstdwDcgLXTk6h0K2AS6cGUtPDuAIP9AEB0lUle6fTja qubu89CJK8JSRrUiacG91hCwoEhBYuaRXscJZjug7atFmjHzWwaUdopttiDdjAiTav0K W2aUGBMO1ueGP1OSMDK23uw96iEuTq7WSY+k7viZyOxR7nkTHj7KuuygxuCPH/Sk5Lex eTog== X-Forwarded-Encrypted: i=1; AJvYcCUKaeQ6x2439riUqVQdXXhpTf39qwdsyoZwgfxUqoLsOtZsTGzo1Cz7RzBtdntlyPrdBPEVUsEPLu97K24=@vger.kernel.org X-Gm-Message-State: AOJu0Yxn5a9PoH1gkea7TIwDzrPWwywP6OACnzqBDP7jFxPmTWBkURc9 T6Srii3HBky4wVzrGIofKqvUXU6Yv6qkgewcWTvf0wJYFF4XL91KtgKk X-Gm-Gg: ATEYQzy4gPJDINuiPZujmy/UICSmKFgRGseTe31RmvAVEgE07TZ8GBiSpCaOXidbQN4 UJeSdYfCnWi3UM8Le06HBs1ciegYf4d4OWsxEs1CdueJkMGN+TdpTK9L6dOZ/CfnT/rExVYZTvd jysviYkbRxo7kTEZhMicnoA4rrcVWQB4ZHa+3amulgJVdch3hXBU8dfSSwZxcHDGWxf5EjHca7Y cxH/HdjTZYNmsiZEacRryoeVhDAZQHpsKE0akj+AuPKNQ5UVnekVSfSmsOFMQ6auEsGCojemC5U 74gl4+0nqnBtPB1jaUhF1sVhvaD5Ts3Lqvb7E0cbK4061Po6+WibRb4MHPGCM7h2TrFsTOMy60r 3FHRe1zbruD87IpEsl5WInyJwRXplmbLmWVYCyUpQ8CNvswFlMvo4Cv4VZE1UByPwUQ5N1XpfNd lNFNWi5SxBD/rRWCoN6e1jIoWdPibU1p2+rCCTVMThs5lTt+ZcJI/mL0WmZtyIp6lDbyQd+Y/iQ YR1pBk= X-Received: by 2002:a05:6a00:4215:b0:81e:b93a:ab09 with SMTP id d2e1a72fcca58-8295d845021mr5335049b3a.1.1772647906891; Wed, 04 Mar 2026 10:11:46 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 10:11:44 -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 3/3] clk: mediatek: mt7622-infracfg: Switch to common probe/remove helpers Date: Thu, 5 Mar 2026 03:10:24 +0900 Message-ID: <20260304181024.738391-4-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 MT7622 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-mt7622-infracfg.c | 70 ++++------------------ 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7622-infracfg.c b/drivers/clk/media= tek/clk-mt7622-infracfg.c index cfdf3b07c3e0..2e463d1481d0 100644 --- a/drivers/clk/mediatek/clk-mt7622-infracfg.c +++ b/drivers/clk/mediatek/clk-mt7622-infracfg.c @@ -9,7 +9,6 @@ #include #include =20 -#include "clk-cpumux.h" #include "clk-gate.h" #include "clk-mtk.h" #include "reset.h" @@ -51,74 +50,27 @@ static const struct mtk_clk_rst_desc clk_rst_desc =3D { .rst_bank_nr =3D ARRAY_SIZE(infrasys_rst_ofs), }; =20 +static const struct mtk_clk_desc infra_desc =3D { + .clks =3D infra_clks, + .num_clks =3D ARRAY_SIZE(infra_clks), + .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_mt7622_infracfg[] =3D { - { .compatible =3D "mediatek,mt7622-infracfg" }, + { .compatible =3D "mediatek,mt7622-infracfg", .data =3D &infra_desc }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_match_clk_mt7622_infracfg); =20 -static int clk_mt7622_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_clks, - ARRAY_SIZE(infra_clks), 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_clks, ARRAY_SIZE(infra_clks), clk_data); -free_clk_data: - mtk_free_clk_data(clk_data); - return ret; -} - -static void clk_mt7622_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_clks, ARRAY_SIZE(infra_clks), clk_data); - mtk_free_clk_data(clk_data); -} - static struct platform_driver clk_mt7622_infracfg_drv =3D { .driver =3D { .name =3D "clk-mt7622-infracfg", .of_match_table =3D of_match_clk_mt7622_infracfg, }, - .probe =3D clk_mt7622_infracfg_probe, - .remove =3D clk_mt7622_infracfg_remove, + .probe =3D mtk_clk_simple_probe, + .remove =3D mtk_clk_simple_remove, }; module_platform_driver(clk_mt7622_infracfg_drv); =20 --=20 2.52.0