From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 37D6841A794 for ; Mon, 3 Aug 2026 14:18:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766689; cv=none; b=rZwhqMf+4TNCnxoYTCaw5sKeFjR/GaEilgnpBQgMy84ctWnQ4Qx5YDuOiGznPZX1pxIuG4U1Hf7lnnwp+IxYPYYn7//rlixdDoGVBd2hqOQll2i2hJnpTY5y5zZ86qCERmcvtrjIHGwewD7etK75XqQ6b1AB3baeA3g5ShB+FT4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785766689; c=relaxed/simple; bh=MLI5y678+94kda6BFxWOuNupkCQ3DfRm8M73wi7fZVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KU8gU0cngcuKwAiq/5XVrvtNsDMWWYI0zGgTt8OCWJlSEDg08D9TNhPjlsUy3EY3sERjUwwJmFlj6tz9TBl7DAy7NsmNXRfBgdtA+Y5zn7sPvSTM/qYZGTwd9tBtlxtEcmzOJy70cAqESvDTjsfrwRz7HUps2r8ojaLOUxS5dCY= 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=SHbrm+OP; arc=none smtp.client-ip=209.85.216.46 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="SHbrm+OP" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-38125cebfdaso4337504a91.1 for ; Mon, 03 Aug 2026 07:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785766688; x=1786371488; 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=on4B/LfqkHipeTiwMXYITPpUbegoRxXk89rke8WT6Ak=; b=SHbrm+OPfMbEzCX/XgOR5mtFgQMosray+RYKVaV+UKe+Ew4EViThBKkyqKpNkA92KN l6m2O8d8KHpCVgJc1utgMck7Eju8mqnsshPjNE+7wjA9Herjm9r97FtznHX9O+W066YC hZNAabVft8X82wZj4nUOekdch+FhjxosNpNoPOp004xAzs0rpGiftfx1IuPQS9SdMTjK SYnQqV1ei7h51u32xqcLxEDAla6tHWDy8Bp0zjo7rpbdwRDyLvq5jJVYCvTnoL+rsUtz KmenlESiK4ET+GCquhvP+fBt4df6bQl+ceAsqs79eq7X4KS7m2dk+VIjkzQuTGfd3pQw +ZUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785766688; x=1786371488; 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=on4B/LfqkHipeTiwMXYITPpUbegoRxXk89rke8WT6Ak=; b=ZKurjzuYJMgQ9LLC+KhGBZYsV/lb63hULKNFjTIU/+e6lfIKCIJjMR4aoKkCnDC8cb LNlc9tbOa1ptn9P9+2ZqIXhDuOa/x/qsOw0nUlJiTtSC+1C5YubH/9aBIfM9XPsjvFdX mY22xdw6WAWMAcW+Oq1cbNLr23ZKqRWJ5lEgKVbyIjrdvxLOsvVktk/mkjRjpxwQP9Ih ODGwWkHHA2OkXq4J7z4RWrJg+HJHcEHOW8ijCBicXCy85q31uqrLy/1jDUjeSKoojKpN GepGvOfETjLpViWXXvdH70PciQ2hbg8D/nkMbDVoqFdfLvntFy+gxqaiv84XIAJOVzow Hvlw== X-Forwarded-Encrypted: i=1; AHgh+Ro00lavxx8WcRrldtfbM7P6jKMU88VSu31qtNWbUm21+J2I0WtmR/7bXf0t7/SKm04vcKd6kSUKmA8=@vger.kernel.org X-Gm-Message-State: AOJu0YyVBlzxTwrJSyDxzgb92AnK1n16mU6dJQY3n7Z7jnKnHKxjcNqp wriNqcxJEtyis3x4njYesvBtPHTZlsutxuAcXu6P6HkmYogpAEaVEr7v X-Gm-Gg: AR+sD101ayPUqM8oRuZGxVH50IiRwJ9lBgcFeClrh2BZohTKzn2WL/A6ATvM8cqWQgn 7SLFpg6iekuFcDmFluFL3dMH8L9Ctjz7xtx/wNu1G8AeuznVz1Cv2b3IYBXxU8OyM3Py0RIl6nU 7cGuhtRo2vEbZwFgzNZ5AhzhU86gbltLKHj4SF9bYPs6RFt0dswRI0cJn0tGku41Hiz/Ea0UZG3 4BWKt95IzzbJ9nndM8Bsq9uMLOQ26Ulppbq8V5Ndpeb1UdKaOI4wHVqqnKkSulNWu2X2UNlNVGw a+VksKXGadZFtmwZ/O61SWmhWVvSPwvJ50VWPWMCsgxBLVUwMIDuGWL0HJ3w0MQbtX9lVY1x4kS xjbwZtDmX3AdpAFYR/mNBEbCu+q+TbtUqMQo2GqHYq691piFRzJbw/sH8zPYztpwD+APNAOOUf4 YcXq4CynXaE/4iZbC75AMSuJlO+7bW38MEQofWFHU/3imYOYv+wQ7Se3y33zq88G4msy87CkGs8 MzF/juBIGexhIL1zp2r X-Received: by 2002:a17:90b:5643:b0:38e:2f21:3bb5 with SMTP id 98e67ed59e1d1-38fbc4cfde2mr9523866a91.21.1785766687657; Mon, 03 Aug 2026 07:18:07 -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.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2026 07:18:07 -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 09/32] clk: mediatek: Add cpumux support to common probe/remove helpers Date: Mon, 3 Aug 2026 23:16:36 +0900 Message-ID: <20260803141659.559129-10-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-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" const struct mtk_gate_regs cg_regs_dummy = { 0, 0, 0 }; EXPORT_SYMBOL_GPL(cg_regs_dummy); @@ -513,6 +514,7 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, num_clks = mcd->num_clks + mcd->num_composite_clks; num_clks += mcd->num_fixed_clks + mcd->num_factor_clks; num_clks += mcd->num_mux_clks + mcd->num_divider_clks; + num_clks += mcd->num_cpumuxes; clk_data = mtk_alloc_clk_data(num_clks); if (!clk_data) { @@ -542,6 +544,13 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, goto unregister_factors; } + if (mcd->cpumuxes) { + r = 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 = mtk_clk_register_composites(&pdev->dev, @@ -549,7 +558,7 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev, mcd->num_composite_clks, base, mcd->clk_lock, clk_data); if (r) - goto unregister_muxes; + goto unregister_cpumuxes; } if (mcd->divider_clks) { @@ -605,6 +614,10 @@ static int __mtk_clk_simple_probe(struct platform_device *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_device *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; -- 2.55.0