From patchwork Fri Feb 28 16:57:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Heiko_St=C3=BCbner?= X-Patchwork-Id: 13996801 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 9BF78C282C1 for ; Fri, 28 Feb 2025 17:01:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eyvQ0/Z7QTBfO6CGrJXY2+e55dObdyQNr27A1fDZuvY=; b=NSHxXxZzUVz18kNBXm9KZn4tRz bxQdk2uXefir1vTtatPGGph28/uhpXtM/fJNmVHyy7hNvB7ROn4Po/3LvG0cshXC2hCOAGHefYnxk y3SqLNJKK/khDm7DdoIojWj24I+8cl607Js4E5iRQkNxbpdRECWrZoFNx/eo/cSSndiS2B3kf0UJ2 B+Ucyp9oBvpgdy352hGSZ+4cOId4i01TWQ6DiPL7DyFUSMwu1/Jao7wedQxVLT8O3vTD7UNhPZORY qaIC1tHiqKy1x8nj+9Ui6J+zEnRUXYScHVBoeNmaZIxb2cUi8G/snySlxFheFCilmI8mCyuBLRV1+ j8BiUWnA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1to3k2-0000000Bp4u-2Dye; Fri, 28 Feb 2025 17:01:38 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1to3gv-0000000Bo9V-3doh; Fri, 28 Feb 2025 16:58:27 +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=eyvQ0/Z7QTBfO6CGrJXY2+e55dObdyQNr27A1fDZuvY=; b=qCZpn5kP3AmOL4XNREB1JHUcVk zdURugz3vhK0Yjh1pHiqNWNf7RPvmhw2cmaAIvlIJpfLIDreTy6yEGIDVKBan2QrrVAtBVRGajJEE dor13iJ7yX+ZBQcnBtCF8A7W+x8OrXMYRcgWtTvM5/zH69VaPZqFhMjjBznaUDPhrUxWJU2liPvRj Nsrc1FWO2dWtPXY6yj8rlA/5F9bqwilOIxyzWPqIVcfXt9eNLI0n0ZM0oOCigrkcoT88ioB7gHLsg sqaA4hg34AxLUCr3jKja5IqLRChfwq3aqoFkXzk4YK2FNpUPLaiDso0YSfKBcmp9XgQEiti5gwdg+ eqQYvNdQ==; Received: from i53875b47.versanet.de ([83.135.91.71] helo=localhost.localdomain) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1to3gh-00029i-84; Fri, 28 Feb 2025 17:58:11 +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 1/2] drm/rockchip: lvds: move pclk preparation in with clk_get Date: Fri, 28 Feb 2025 17:57:54 +0100 Message-ID: <20250228165755.405138-2-heiko@sntech.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250228165755.405138-1-heiko@sntech.de> References: <20250228165755.405138-1-heiko@sntech.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250228_085825_931750_50818F25 X-CRM114-Status: GOOD ( 17.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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". Signed-off-by: Heiko Stuebner Reviewed-by: Quentin Schulz --- drivers/gpu/drm/rockchip/rockchip_lvds.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c index 385cf6881504..c19b7b1f6cb5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c @@ -448,13 +448,11 @@ 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"); 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 = {