From patchwork Tue Mar 4 12:44:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 14000651 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C395C021B8 for ; Tue, 4 Mar 2025 12:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m783Pn+Eu3u8oFLoxIAKN6Djj80GaKVAGUx9C9cqljk=; b=OEfGzipd91i/0t fdeMYg0bMg3ubnh3N4/8nvbGFdJbrx/p0cQG+Vh53sXpUlEhVrcXeEDj93bTVCSDRM3skbcfNWGlt +v0w2DsxPIH9jDxehxPQqAHIcSja4Foj1Xw8ZaMLZig0vitWAwcCtk2uFTmNwtUzxKJWCXCIkhVfE uWSCokwe3qLGqempx+YTfLpI/LDv4ovj9Aw2S2zS+WY4a0Myam55hm4KWeWLv/QfZf06QQL5qE2h5 ubB6ai3DA1jfCvFz5Nvdt6wr1Nu8ne0PfnO0CR20yFOOTUNpYdGjlfFk0jzigk3h1Ov0FJ6S4PTzZ xUSQd9gJqY8hQtmh5VUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpRfE-00000004g74-3C6M; Tue, 04 Mar 2025 12:46:24 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpRdd-00000004fqq-1G77; Tue, 04 Mar 2025 12:44:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=SOimxFjP0O74i2+ZLCuEU3KuzT1QQlg4XvqoNtXpw3o=; b=bu7qt+Ve6i7GD+d3Lp7PEEAHQa UmvRgCzyBPyZ0GJSgtpye0Z6fUXBQ0x+DMAWX11tAZ4BdcS1zAsHPOjsvzg02Qcuev2iz/EkG+qSI sYgP8FFqYnHFZpE3UIOetrOES9qnzjC6aej7whTkqjU82KBcQ4iJW1bBi9a9zreaObl4ZHk8c9aJ5 2K5OeF4Vh246BNkMeAdRzNQYpRdiHZdndVccZe/x1RzDqnz92jMIwYtWWc2ClORlFglLS7llCdiE3 WJbTbj3y5FRWT0rgwMlsLqWtdbmMb3DZE+ZY62FOeAZ1vKmwtrScw9Dk88gjbZ9mADlAhi9U7iC6r YNaQUtgg==; Received: from i53875a38.versanet.de ([83.135.90.56] helo=phil..) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1tpRdR-0003B0-MS; Tue, 04 Mar 2025 13:44:33 +0100 From: Heiko Stuebner To: heiko@sntech.de Cc: andy.yan@rock-chips.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, quentin.schulz@cherry.de, Heiko Stuebner Subject: [PATCH v3 1/3] drm/rockchip: lvds: move pclk preparation in with clk_get Date: Tue, 4 Mar 2025 13:44:16 +0100 Message-ID: <20250304124418.111061-2-heiko@sntech.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250304124418.111061-1-heiko@sntech.de> References: <20250304124418.111061-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250304_044445_389890_827682A9 X-CRM114-Status: GOOD ( 17.54 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Heiko Stuebner The LVDS block needs a separate pclk only on some socs, so currently requests and prepares it in the soc-specific probe function, but common code is required to unprepare it in the error path or on driver remove. While this works because clk_unprepare just does nothing if clk is NULL, this mismatch of who is responsible still is not very nice. The clock-framework already has a helper for clk-get-and-prepare even with devres support in devm_clk_get_prepared(). This will get and prepare the clock and also unprepare it on driver removal, saving the driver from having to handle it "manually". Reviewed-by: Quentin Schulz Reviewed-by: Andy Yan Signed-off-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_lvds.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c index 385cf6881504..ecfae8d5da89 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -448,15 +448,13 @@ struct drm_encoder_helper_funcs px30_lvds_encoder_helper_funcs = { static int rk3288_lvds_probe(struct platform_device *pdev, struct rockchip_lvds *lvds) { - int ret; - lvds->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(lvds->regs)) return PTR_ERR(lvds->regs); - lvds->pclk = devm_clk_get(lvds->dev, "pclk_lvds"); + lvds->pclk = devm_clk_get_prepared(lvds->dev, "pclk_lvds"); if (IS_ERR(lvds->pclk)) { - DRM_DEV_ERROR(lvds->dev, "could not get pclk_lvds\n"); + DRM_DEV_ERROR(lvds->dev, "could not get or prepare pclk_lvds\n"); return PTR_ERR(lvds->pclk); } @@ -480,12 +478,6 @@ static int rk3288_lvds_probe(struct platform_device *pdev, } } - ret = clk_prepare(lvds->pclk); - if (ret < 0) { - DRM_DEV_ERROR(lvds->dev, "failed to prepare pclk_lvds\n"); - return ret; - } - return 0; } @@ -728,20 +720,15 @@ static int rockchip_lvds_probe(struct platform_device *pdev) dev_set_drvdata(dev, lvds); ret = component_add(&pdev->dev, &rockchip_lvds_component_ops); - if (ret < 0) { + if (ret < 0) DRM_DEV_ERROR(dev, "failed to add component\n"); - clk_unprepare(lvds->pclk); - } return ret; } static void rockchip_lvds_remove(struct platform_device *pdev) { - struct rockchip_lvds *lvds = platform_get_drvdata(pdev); - component_del(&pdev->dev, &rockchip_lvds_component_ops); - clk_unprepare(lvds->pclk); } struct platform_driver rockchip_lvds_driver = {