From patchwork Wed Feb 12 09:44:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manikandan Muralidharan X-Patchwork-Id: 13971782 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 DEAAAC02198 for ; Wed, 12 Feb 2025 10:06: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-Type: Content-Transfer-Encoding:MIME-Version: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:In-Reply-To:References:List-Owner; bh=0/pOGJNL993DPyoMevAgdGrHFiNsXmQDI8AHiFFQmMs=; b=vli3gEFmx/jmROxJxlO5PTih/k ZLe9qBKikyT37TaJxHcU17psdyOAyS/sI1dGit5eY1etkrNuE6V6KVhedH2rBA+P2kh2e8BGzLibk M5cc1+CFc3EY/zNvhHCuRn20erN4baY9fF+OqnWRDTL8bDnNKKDeSLOdWvXSAzIiUqKKT3hv11+VW 6WPdoLyHMBaJgtNMXPLX6DtJPbX39HnkneuOrUocL5z7yxwIrayzzl/LEbi4pWspGFHrdojCjgtdK 3yFzPw+XLLqKqOqHB8+alLDc66Zj7TgSp70IYws7HFTdPU6YxlnCJ58QcOPXAWB+CCOo9gECCeK8S 7cjV1fPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ti9df-00000006vSJ-16oA; Wed, 12 Feb 2025 10:06:39 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1ti9Im-00000006qDk-1cSr for linux-arm-kernel@lists.infradead.org; Wed, 12 Feb 2025 09:45:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1739353504; x=1770889504; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Sa8bPFHTaj9aW+dktFBUNt2YyId16vwK369IXtQxnwo=; b=tT16+YuiFYjNEgtSRGy4URKPusCEq2iZzb/lUjIzVuwLhKONAL3CLWMk eF+7u64aPn5F8JCOzU98yAIQ3lJx3Uj6NYRY7eqPEMnOnhokKiWicpX+A qGYgrzrPwWRvaAMweTDBH2xpLFdAy5HX1BCEDYlU4SkEjE67bB0qaAYRv MPtFqqZiau9KIhTvHbo7YZfqK9SLe2UECAnUTKtZ+JH/O1juUScX9nqjD aOImANhO13+aXLd0Yand4LokxsigXalLS37/z2kGiltsdzmBTplxRJlH7 l1/7iOEmZE5QQQoAu9j8GUhLyB8on/vqDm2pA9YCgokEOAfcdA/cUDGLX g==; X-CSE-ConnectionGUID: hX8HeKjRTlCEQQ9RkVLg4A== X-CSE-MsgGUID: BJci5WDbS2KJ5oBT4WqMpQ== X-IronPort-AV: E=Sophos;i="6.13,279,1732604400"; d="scan'208";a="38002164" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 12 Feb 2025 02:45:03 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 12 Feb 2025 02:45:01 -0700 Received: from che-lt-i67131.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 12 Feb 2025 02:44:55 -0700 From: Manikandan Muralidharan To: , , , , , , , , , , , , , CC: Dharma Balasubiramani , Manikandan Muralidharan Subject: [PATCH v2 1/3] drm: atmel-hlcdc: add support for LVDS encoder type Date: Wed, 12 Feb 2025 15:14:47 +0530 Message-ID: <20250212094449.109622-1-manikandan.m@microchip.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250212_014504_489813_E677884F X-CRM114-Status: GOOD ( 11.64 ) 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: Dharma Balasubiramani Add support for encoder type "DRM_MODE_ENCODER_LVDS" with the following bus formats: - RGB888_1X7X4_SPWG - RGB888_1X7X4_JEIDA - RGB666_1X7X3_SPWG - RGB666_1X18 Signed-off-by: Dharma Balasubiramani [manikandan.m@microchip.com: move modifications inside the atmel_xlcdc_connector_output_lvds fn] Signed-off-by: Manikandan Muralidharan --- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index 0f7ffb3ced20..0e709047369a 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -356,6 +356,42 @@ static int atmel_xlcdc_connector_output_dsi(struct drm_encoder *encoder, return supported_fmts; } +static int atmel_xlcdc_connector_output_lvds(struct drm_encoder *encoder, + struct drm_display_info *info) +{ + int j; + unsigned int supported_fmts = 0; + + switch (atmel_hlcdc_encoder_get_bus_fmt(encoder)) { + case 0: + break; + case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG: + case MEDIA_BUS_FMT_RGB666_1X18: + return ATMEL_HLCDC_RGB666_OUTPUT; + case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG: + case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA: + return ATMEL_HLCDC_RGB888_OUTPUT; + default: + return -EINVAL; + } + + for (j = 0; j < info->num_bus_formats; j++) { + switch (info->bus_formats[j]) { + case MEDIA_BUS_FMT_RGB666_1X7X3_SPWG: + case MEDIA_BUS_FMT_RGB666_1X18: + supported_fmts |= ATMEL_HLCDC_RGB666_OUTPUT; + break; + case MEDIA_BUS_FMT_RGB888_1X7X4_SPWG: + case MEDIA_BUS_FMT_RGB888_1X7X4_JEIDA: + supported_fmts |= ATMEL_HLCDC_RGB888_OUTPUT; + break; + default: + break; + } + } + return supported_fmts; +} + static int atmel_hlcdc_connector_output_mode(struct drm_connector_state *state) { struct drm_connector *connector = state->connector; @@ -374,6 +410,8 @@ static int atmel_hlcdc_connector_output_mode(struct drm_connector_state *state) */ if (encoder->encoder_type == DRM_MODE_ENCODER_DSI) return atmel_xlcdc_connector_output_dsi(encoder, info); + else if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) + return atmel_xlcdc_connector_output_lvds(encoder, info); switch (atmel_hlcdc_encoder_get_bus_fmt(encoder)) { case 0: From patchwork Wed Feb 12 09:44:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manikandan Muralidharan X-Patchwork-Id: 13971783 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 9D467C021A0 for ; Wed, 12 Feb 2025 10:08:16 +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-Type: Content-Transfer-Encoding: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=4TIZYbwqNyBKQPtN9RUr0YEpI/gqW7eYbko8Gi7UzJc=; b=fP6POMA94l2cO4R34X9rhvGx/E yNWgKevWsiwuKM3yYqIvvIeRHF3SVOCMbalyhv76wm6Gxs0SC07M586qJ2zG8L63W+0QFRvhlb7MY g3obb13xnClf1Q+jqepDYJA5QRq5QG+fhICi0TmGN3ehN+sETK45FdNScpCCHROFgNEqDOXue1q05 f19UJNd2BUnw3tno3dznQEDn7qWW3o+9vQIvB7sYSFjfUiMArbeCPRX32kzRPr4pOgZetGN5PQF1p uOgdAgZVkiEL1rJJNm5fRatHfpfbbysjj2TQwbX8pVraWko4C7uGfUYAxIqXHnT96Z7VbxCjaImN9 Y3dL2qnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ti9f4-00000006veo-0MAt; Wed, 12 Feb 2025 10:08:06 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1ti9Iw-00000006qIa-2eKf for linux-arm-kernel@lists.infradead.org; Wed, 12 Feb 2025 09:45:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1739353514; x=1770889514; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1NSB5qjI3HdwTQRBQBnjuqJ4TpcqIKiTpLxKV/W6NhQ=; b=KPT9WL31HgGlK7dtvELul90TDouOKF84qxmlR5rIGxee4THk1H9PQIfS hyEuEB96MIgFsngKysS3+6RJT8VLCfRiJTz0AzuLsx+peuJnqEyf6Irvx +k58DWKK7EriKLrzDIjOyR1I4MDSolkzsdoxW9JZnrO8RGMptlNOcJPpi 2iWyoyN4w/IrUG26+VPuIIN/pZ6Yc5UhEq86jvjf94Wpx1suHVVdjvxyN 7TeUPS6rCx0REX/Q5f2+pNXwMbws5jQcyK+InCPjDKjP1BqUcJetzy/ao qv2NyNhqp43e5/s5Ydg4Fn1E1rLEKBHWnXfspRC9U9uOFB5KbILKMh1ge w==; X-CSE-ConnectionGUID: qkANol4LQQKG05F3y7BElw== X-CSE-MsgGUID: P7uX/GQ0TOmWM4WVOBVmyA== X-IronPort-AV: E=Sophos;i="6.13,279,1732604400"; d="scan'208";a="37191058" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 12 Feb 2025 02:45:13 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 12 Feb 2025 02:45:08 -0700 Received: from che-lt-i67131.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 12 Feb 2025 02:45:01 -0700 From: Manikandan Muralidharan To: , , , , , , , , , , , , , CC: Manikandan Muralidharan , "Dharma Balasubiramani" Subject: [PATCH v2 2/3] mfd: atmel-hlcdc: fetch LVDS PLL clock for LVDS display Date: Wed, 12 Feb 2025 15:14:48 +0530 Message-ID: <20250212094449.109622-2-manikandan.m@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250212094449.109622-1-manikandan.m@microchip.com> References: <20250212094449.109622-1-manikandan.m@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250212_014514_731161_069AE74F X-CRM114-Status: GOOD ( 15.49 ) 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 The XLCDC IP supports parallel RGB, MIPI DSI and LVDS Display. The LCD Generic clock (sys_clk) is used for Parallel RGB and MIPI displays, while the LVDS PLL clock (lvds_pll_clk) is used for LVDS displays.Since both the clocks cannot co-exist together in the DT for a given display, this patch first attempts to retrieve sys_clk If that fails,it then tries to acquire lvds_pll_clk. Signed-off-by: Manikandan Muralidharan Signed-off-by: Dharma Balasubiramani --- changes in v2: - Rephrase the comments, commit message and err logs - Replace dev_err wwith dev_warn - Remove Initializing sys_clk and lvds_pll_clk to NULL post devm_kzalloc() call --- drivers/mfd/atmel-hlcdc.c | 16 ++++++++++++++-- include/linux/mfd/atmel-hlcdc.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/atmel-hlcdc.c b/drivers/mfd/atmel-hlcdc.c index 4c4e35d404f3..f680392b01ba 100644 --- a/drivers/mfd/atmel-hlcdc.c +++ b/drivers/mfd/atmel-hlcdc.c @@ -108,10 +108,22 @@ static int atmel_hlcdc_probe(struct platform_device *pdev) return PTR_ERR(hlcdc->periph_clk); } + /* + * Retrieve any one of the Main clk required by the LCD to operate: + * + * LCDC Generic Clock (sys_clk) - Parallel RGB and MIPI displays, + * LVDS PLL (lvds_pll_clk) - LVDS display + */ hlcdc->sys_clk = devm_clk_get(dev, "sys_clk"); if (IS_ERR(hlcdc->sys_clk)) { - dev_err(dev, "failed to get system clock\n"); - return PTR_ERR(hlcdc->sys_clk); + dev_warn(dev, + "failed to get LCDC generic clock, trying for LVDS PLL clock instead\n"); + + hlcdc->lvds_pll_clk = devm_clk_get(dev, "lvds_pll_clk"); + if (IS_ERR(hlcdc->lvds_pll_clk)) { + dev_err(dev, "failed to get LVDS PLL clock\n"); + return PTR_ERR(hlcdc->lvds_pll_clk); + } } hlcdc->slow_clk = devm_clk_get(dev, "slow_clk"); diff --git a/include/linux/mfd/atmel-hlcdc.h b/include/linux/mfd/atmel-hlcdc.h index 80d675a03b39..07c2081867fd 100644 --- a/include/linux/mfd/atmel-hlcdc.h +++ b/include/linux/mfd/atmel-hlcdc.h @@ -75,6 +75,7 @@ */ struct atmel_hlcdc { struct regmap *regmap; + struct clk *lvds_pll_clk; struct clk *periph_clk; struct clk *sys_clk; struct clk *slow_clk; From patchwork Wed Feb 12 09:44:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manikandan Muralidharan X-Patchwork-Id: 13971784 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 549D9C021A0 for ; Wed, 12 Feb 2025 10:09:45 +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-Type: Content-Transfer-Encoding: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=tcCFq58YfabomLAUPfnTZqfwTLlYJfN03N2Waux9tTA=; b=xtoXaGrZC0cSlWNaVfcAKKFmBS WS7xfVIsM4vjTHanoY1ScR5p8fHkbeFgoJsOVjwC/GLfTkMsqCybad8Y8a3W8RZLuAJ7bjZt8Obe/ RJdGWZOXfxci7ra5V5CiAQWy4fpujp2vEPdYU/d3ndV0XEkyJcO9CMOpWmLTgbmMntr/OBqqj9avC HgY6jLYnSXFqlR1YXp0eomVh8pKSpv/CqOPFChmQ4lXH0xa7LaZRsXaZpoHVjjPJxq5o6ZQ0H+xxk fp76Ees4A+palB3FlJjd1BpZP4nZ6WRE62NdBSzkDnc+EUHwYLX1n1hyfAt27A/mI9xTf8tvvVh1Q Oq2Hw/EQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ti9gS-00000006vxW-3Br2; Wed, 12 Feb 2025 10:09:32 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1ti9Jd-00000006qTo-0FB7 for linux-arm-kernel@lists.infradead.org; Wed, 12 Feb 2025 09:45:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1739353557; x=1770889557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vnx2AdOW50HMFVLSHH43ey2HhNMvsX6+y6C07WIJ1a8=; b=P2h8LCtr6/AftpB/i+MHBUiEOAGRkXwDZ0pIjJ4nUGsUiDXhKgw16NuH 2EcpS6+2zNXyFXClH6FmxWIFNJQlW92qPfDHztd0/HtRKodRe3d0In+Ph CsLaCx6e4DF/yskWSTCgwhy1vooGb3zFZIRBzG8u+xZSVV4r8tSJH1NqP 52kVAxJnEaKkMtuSuDsOYhBQOmTCdtMkB+0tYIuLyOA1xgL3WLMqpaxYi pd1eVQCoatOc5bPJCE/GsRaJ+UO3ZZnlozJ5FZp7YGawtXDr2YiarXEZ6 /6YUByzi8rDjnxOfqNSnxKXjjL5jWNg5ew3+ErhkDWQJgAPVxw3OuOKf3 A==; X-CSE-ConnectionGUID: 8MuVtLdRQ2uCYR3xxsN4MA== X-CSE-MsgGUID: poXRycaeTVyvkAHRJFv8uw== X-IronPort-AV: E=Sophos;i="6.13,279,1732604400"; d="scan'208";a="37585559" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 12 Feb 2025 02:45:55 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 12 Feb 2025 02:45:14 -0700 Received: from che-lt-i67131.microchip.com (10.10.85.11) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 12 Feb 2025 02:45:08 -0700 From: Manikandan Muralidharan To: , , , , , , , , , , , , , CC: Dharma Balasubiramani , Manikandan Muralidharan Subject: [PATCH v2 3/3] drm: atmel-hlcdc: set LVDS PLL clock rate for LVDS Displays Date: Wed, 12 Feb 2025 15:14:49 +0530 Message-ID: <20250212094449.109622-3-manikandan.m@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250212094449.109622-1-manikandan.m@microchip.com> References: <20250212094449.109622-1-manikandan.m@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250212_014557_112818_2CDB921B X-CRM114-Status: GOOD ( 15.22 ) 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: Dharma Balasubiramani The LVDS PLL clock runs at 7 times the panel pixel clock. For LVDS displays, the PLL clock rate is set based on the panel pixel clock, eliminating the need for the assigned-clock-rates Device Tree property for lvds_pll_clk in the LCD node. Signed-off-by: Dharma Balasubiramani Signed-off-by: Manikandan Muralidharan --- Changes in v2: - Rephrase commit message and comment block --- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c index 0e709047369a..cf4f9ccd81a4 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -99,9 +99,15 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) drm_connector_list_iter_end(&iter); } - ret = clk_prepare_enable(crtc->dc->hlcdc->sys_clk); - if (ret) - return; + if (crtc->dc->hlcdc->lvds_pll_clk) { + ret = clk_prepare_enable(crtc->dc->hlcdc->lvds_pll_clk); + if (ret) + return; + } else { + ret = clk_prepare_enable(crtc->dc->hlcdc->sys_clk); + if (ret) + return; + } vm.vfront_porch = adj->crtc_vsync_start - adj->crtc_vdisplay; vm.vback_porch = adj->crtc_vtotal - adj->crtc_vsync_end; @@ -186,7 +192,10 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) ATMEL_XLCDC_DPI : ATMEL_HLCDC_MODE_MASK), cfg); - clk_disable_unprepare(crtc->dc->hlcdc->sys_clk); + if (crtc->dc->hlcdc->lvds_pll_clk) + clk_disable_unprepare(crtc->dc->hlcdc->lvds_pll_clk); + else + clk_disable_unprepare(crtc->dc->hlcdc->sys_clk); } static enum drm_mode_status @@ -242,7 +251,11 @@ static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c, 10, 1000)) dev_warn(dev->dev, "Atmel LCDC status register CLKSTS timeout\n"); - clk_disable_unprepare(crtc->dc->hlcdc->sys_clk); + if (crtc->dc->hlcdc->lvds_pll_clk) + clk_disable_unprepare(crtc->dc->hlcdc->lvds_pll_clk); + else + clk_disable_unprepare(crtc->dc->hlcdc->sys_clk); + pinctrl_pm_select_sleep_state(dev->dev); pm_runtime_allow(dev->dev); @@ -255,15 +268,38 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c, { struct drm_device *dev = c->dev; struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c); + struct drm_display_mode *adj = &c->state->adjusted_mode; struct regmap *regmap = crtc->dc->hlcdc->regmap; unsigned int status; + int ret; pm_runtime_get_sync(dev->dev); pm_runtime_forbid(dev->dev); pinctrl_pm_select_default_state(dev->dev); - clk_prepare_enable(crtc->dc->hlcdc->sys_clk); + + if (crtc->dc->hlcdc->lvds_pll_clk) { + /* + * For LVDS displays, retrieve the pixel clock from the panel + * and set the LVDS PLL clock rate accordingly. + * According to the datasheet,the LVDS PLL clock is 7 times the pixel clock. + */ + ret = clk_set_rate(crtc->dc->hlcdc->lvds_pll_clk, + (adj->clock * 7 * 1000)); + if (ret) { + dev_err(dev->dev, "Failed to set LVDS PLL clk rate: %d\n", ret); + return; + } + + ret = clk_prepare_enable(crtc->dc->hlcdc->lvds_pll_clk); + if (ret) + return; + } else { + ret = clk_prepare_enable(crtc->dc->hlcdc->sys_clk); + if (ret) + return; + } regmap_write(regmap, ATMEL_HLCDC_EN, ATMEL_HLCDC_PIXEL_CLK); if (regmap_read_poll_timeout(regmap, ATMEL_HLCDC_SR, status,