From nobody Fri Sep 20 10:39:13 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31373C61D94 for ; Tue, 21 Nov 2023 12:51:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233698AbjKUMvb (ORCPT ); Tue, 21 Nov 2023 07:51:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233865AbjKUMvO (ORCPT ); Tue, 21 Nov 2023 07:51:14 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 073D7D7B; Tue, 21 Nov 2023 04:51:04 -0800 (PST) Received: from IcarusMOD.eternityproject.eu (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id E7F0D6607325; Tue, 21 Nov 2023 12:51:02 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1700571063; bh=zNfya3IwOleE3gv7u+f222r6Eh2oBHfy4LgRig9Wjl4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JME8J0fOzBllttmy6YP2f3UBamsismPO7cYy+ESjToe7kho7iYAUsR25Z+1uEKcm7 KE8sn6k9kq99YUINIwIybXl4NCC8KPJHC1sMS1SgspPRyMUqjWCJ4JsCEMdxEvazGl 3E0+17hF4SP9Pgo6WuYdMQj3W8NnNC7qddBmZphikoPsjgwZ6bla6gouBP3ZdMnoom 4r8/B0JZYS2FIupPHmwhvf/xfvYJfuAcesxMzeMUfAavkcocd0qAzDfUNOBw0ILJx5 5/SIUjAmJoP3xrsz4CW9iYKYMqcFM3j7Kg6DElPz6z1WpYHwpsTuvMlNLcTiDAxzsH P7ZPHcrhlUg+Q== From: AngeloGioacchino Del Regno To: matthias.bgg@gmail.com Cc: krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, robh+dt@kernel.org, angelogioacchino.delregno@collabora.com, p.zabel@pengutronix.de, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, kernel@collabora.com, wenst@chromium.org Subject: [PATCH v3 12/20] soc: mediatek: mtk-svs: Commonize MT8192 probe function for MT8186 Date: Tue, 21 Nov 2023 13:50:36 +0100 Message-ID: <20231121125044.78642-13-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121125044.78642-1-angelogioacchino.delregno@collabora.com> References: <20231121125044.78642-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Include the additions of svs_mt8186_platform_probe() in the common svs_mt8192_platform_probe() function, remove the former, and use the latter as .probe() callback for MT8186. Signed-off-by: AngeloGioacchino Del Regno --- drivers/soc/mediatek/mtk-svs.c | 44 ++++++---------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/drivers/soc/mediatek/mtk-svs.c b/drivers/soc/mediatek/mtk-svs.c index e7df3a577b4c..cd5064683506 100644 --- a/drivers/soc/mediatek/mtk-svs.c +++ b/drivers/soc/mediatek/mtk-svs.c @@ -2119,7 +2119,6 @@ static struct device *svs_add_device_link(struct svs_= platform *svsp, static int svs_mt8192_platform_probe(struct svs_platform *svsp) { struct device *dev; - struct svs_bank *svsb; u32 idx; =20 svsp->rst =3D devm_reset_control_get_optional(svsp->dev, "svs_rst"); @@ -2133,40 +2132,7 @@ static int svs_mt8192_platform_probe(struct svs_plat= form *svsp) "failed to get lvts device\n"); =20 for (idx =3D 0; idx < svsp->bank_max; idx++) { - svsb =3D &svsp->banks[idx]; - - if (svsb->type =3D=3D SVSB_TYPE_HIGH) - svsb->opp_dev =3D svs_add_device_link(svsp, "gpu"); - else if (svsb->type =3D=3D SVSB_TYPE_LOW) - svsb->opp_dev =3D svs_get_subsys_device(svsp, "gpu"); - - if (IS_ERR(svsb->opp_dev)) - return dev_err_probe(svsp->dev, PTR_ERR(svsb->opp_dev), - "failed to get OPP device for bank %d\n", - idx); - } - - return 0; -} - -static int svs_mt8186_platform_probe(struct svs_platform *svsp) -{ - struct device *dev; - struct svs_bank *svsb; - u32 idx; - - svsp->rst =3D devm_reset_control_get_optional(svsp->dev, "svs_rst"); - if (IS_ERR(svsp->rst)) - return dev_err_probe(svsp->dev, PTR_ERR(svsp->rst), - "cannot get svs reset control\n"); - - dev =3D svs_add_device_link(svsp, "thermal-sensor"); - if (IS_ERR(dev)) - return dev_err_probe(svsp->dev, PTR_ERR(dev), - "failed to get lvts device\n"); - - for (idx =3D 0; idx < svsp->bank_max; idx++) { - svsb =3D &svsp->banks[idx]; + struct svs_bank *svsb =3D &svsp->banks[idx]; =20 switch (svsb->sw_id) { case SVSB_SWID_CPU_LITTLE: @@ -2177,7 +2143,11 @@ static int svs_mt8186_platform_probe(struct svs_plat= form *svsp) svsb->opp_dev =3D svs_add_device_link(svsp, "cci"); break; case SVSB_SWID_GPU: - svsb->opp_dev =3D svs_add_device_link(svsp, "gpu"); + if (svsb->type =3D=3D SVSB_TYPE_LOW) + svsb->opp_dev =3D svs_get_subsys_device(svsp, "gpu"); + else + svsb->opp_dev =3D svs_add_device_link(svsp, "gpu"); + break; break; default: dev_err(svsb->dev, "unknown sw_id: %u\n", svsb->sw_id); @@ -2739,7 +2709,7 @@ static const struct svs_platform_data svs_mt8186_plat= form_data =3D { .name =3D "mt8186-svs", .banks =3D svs_mt8186_banks, .efuse_parsing =3D svs_common_parse_efuse, - .probe =3D svs_mt8186_platform_probe, + .probe =3D svs_mt8192_platform_probe, .regs =3D svs_regs_v2, .bank_max =3D ARRAY_SIZE(svs_mt8186_banks), .ts_coeff =3D SVSB_TS_COEFF_MT8186, --=20 2.42.0