From nobody Fri Apr 10 02:33:30 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