From nobody Sun Dec 14 19:29:41 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 3981724888E; Fri, 18 Apr 2025 18:47:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745002043; cv=none; b=rX/geiIttxtnnHmpIGrVc9T3D0WgibamHt12f7ipf3X+7fAR+sofdtDuGz8Mjpx0lApra9LUDasC9uxDC/J0GAC5VD1tT5VLvXzFYDLWDtQa9pDUTnfufUgZjL4Fv8JCzeSTL7Obwq54qsm7lAdj/XbnJa+H67jEgumY1J+XwJg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745002043; c=relaxed/simple; bh=zjmTtn2gE9hwd+SVdMR9ptjJZRM5uiZ2vcRmgIz6SZ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fSaAHCxpFlJPQUkZPPHCXM74a1YD2Sx8UDDTmselmCsV0LiyjJcqOTxYeQ8hQlP2o2w7UDh0Y0YRyvIrunyGinUe9gtFnrGuwLru5skPbuaHf4R5tgEJ6Bf8wkQN95U0z6WTI8o88GH2EpXRwa5lq2/1ptCda4WD3unSd+wTFOw= 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=jshcV55O; arc=none smtp.client-ip=209.85.221.42 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="jshcV55O" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-39c0dfad22aso1406878f8f.2; Fri, 18 Apr 2025 11:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745002039; x=1745606839; 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; bh=x+CP3/I9WfZ+XwFDYN86yxQdjAhABDh87Q7Kh2KE2Hc=; b=jshcV55ORrrH+YvAlN4ovehfKYvARvUzVTzTwhQVb5Xa0RMSexiAGosLGzyI0f6LfN DjtBi1b3GQIC7rUBkSDehMg6GbgxoDjudzJWP0WXoF57gRhQvaiiRsiSFnpIWV3RZaug FibxY5vQGprdDvC56C9MhN9yqM9EkKMcxo57sObyGrQpYelDE5Pb7CgtHmc0NZ5Clq58 AX8o4asu2MUIq7cKcvJSwoxwrpiHrAls/wxAcqpwzizRbNFBKzJz2qt3vwJC1df5Fdzc Rtf3dcL+5Ims2Q6ac5nug0ZIThEruHkwTYT7sf9JMPbiJW+yaKoBx0KRpjiF6KI6CxT/ HQQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745002039; x=1745606839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x+CP3/I9WfZ+XwFDYN86yxQdjAhABDh87Q7Kh2KE2Hc=; b=RneqHHs3Cej4mgHkpn/y6i8zSUytyKVr0tdQdkb+wvNbPGZhPgT01Q50lm0UsuVgYh tZhqxIX0JW4ZZ1Koyui//TVlIHz6EGHamKZSZfj+zfckwmF/NDiJxDTyCsEVAThpsbtP ZbeIENejo8l8MtllICZ0AVH54wYMmMuC5qKDrcbbJ/nUP4Xs6cDaIEN8JZapJY39Plc2 oUxib34bkuxzher5UUbaWVluBGe5NyRKMPvI2jfBOsLEqEwdwSb3Pu6aw+MtraKWHoON prIL/tp3mgBHvxVhiSKxyCO51HlMlY9jReDtZFU4Tw5TABZViuD9qLPwz9LXf0SQulbA 6UlQ== X-Forwarded-Encrypted: i=1; AJvYcCUBb1vR8kYwq6PMlls40U61h05ZLsxJs6mEjFtdZuu6RGWXx/WACQhGUx7XNa1f2HKEPA3JbIkzt4+9@vger.kernel.org, AJvYcCWvnrN8APR8XRKzCIlsd+o+L3v9NHB2JLg0r7SAeCEu7t3sNMBJ3JM1MwORKS6MSD2gsARTLA+lNNXY5bXJ/Ch9h6Q=@vger.kernel.org, AJvYcCXNBZdnkOQe+MOVbl4FSOv+rpE90+cngXs55GL9m1Q5xmDrZdFO2XfuTCr92O619y4l9PlWOZiVIll2XvKa@vger.kernel.org, AJvYcCXfBf3DAIWP0l4IdSR7pTGywZXvCZPXQHFtkAVXGxEafiWafUQc7HeBXktModnCmvp6xNhwRJhpokR9@vger.kernel.org X-Gm-Message-State: AOJu0YwrBN8JH+zn8aXlSikRw3icvl2JgvOAyJM15Ul8NjthwHl1IIQG oBmqnaZwH5vzYwCZSMw67/3ksWtAZscK8x/lrNwq5U+b5A8PyUIA X-Gm-Gg: ASbGncuUb2HiZMzfE5sTrKDLJXZPvL8M3f+RTWT5P6kYevWLv8Gg0RoMapJRAvnQ4dC 131e7DrllRr/oxPtI/Ig9QR2mOTejQDc9tVIv8TWOixbmlq7dCd6KSgHlYLuNe+0q3+q8cfIcX0 nQqUw550ugFIveVFw3FThc6c1RStHxQrSz+1LdwIMKDvR4hJC0o54gXGZ6LosR0eupzvH2ij1pl pNHNmoE7SMEx00TxE4BvU9wsreFj1X5NKbPwDJhavQSMUgrxhDW0aDx/mWCDO25K9QSDLlAmFSL Xwz/3e6zJ17ueNdTxS15QVi4n9Bbdx/PCSJdxSbm9E+hUoFK8ctaO/9tXJEjEhNuaw== X-Google-Smtp-Source: AGHT+IHJP4+DFu1LP5XstoLCXBb43C5w/DOk4Qyo2mNIWyfadPi9ZzKfJsw2ySKeo5BSbqt5FhLbjQ== X-Received: by 2002:a05:6000:1a8d:b0:399:71d4:a9 with SMTP id ffacd0b85a97d-39efbb05e76mr2883687f8f.52.1745002039455; Fri, 18 Apr 2025 11:47:19 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:36cb:c641:13d7:bd3d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39efa4931b8sm3404336f8f.80.2025.04.18.11.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Apr 2025 11:47:18 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Biju Das , Geert Uytterhoeven , Michael Turquette , Stephen Boyd , Philipp Zabel , Magnus Damm Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Prabhakar , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v3 09/15] drm: renesas: rz-du: mipi_dsi: Add OF data support Date: Fri, 18 Apr 2025 19:46:52 +0100 Message-ID: <20250418184658.456398-10-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250418184658.456398-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250418184658.456398-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar In preparation for adding support for the Renesas RZ/V2H(P) SoC, this patch introduces a mechanism to pass SoC-specific information via OF data in the DSI driver. This enables the driver to adapt dynamically to various SoC-specific requirements without hardcoding configurations. The MIPI DSI interface on the RZ/V2H(P) SoC is nearly identical to the one on the RZ/G2L SoC. While the LINK registers are shared between the two SoCs, the D-PHY registers differ. Also the VCLK range differs on both these SoCs. To accommodate these differences `struct rzg2l_mipi_dsi_hw_info` is introduced and as now passed as OF data. These changes lay the groundwork for the upcoming RZ/V2H(P) SoC support by allowing SoC-specific data to be passed through OF. Co-developed-by: Fabrizio Castro Signed-off-by: Fabrizio Castro Signed-off-by: Lad Prabhakar --- v2->v3: - Dropped !dsi->info check in rzg2l_mipi_dsi_probe() as it is not needed. v1->v2: - Added DPHY_RST as feature flag --- .../gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 65 ++++++++++++++----- .../drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 2 - 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c b/drivers/gpu/d= rm/renesas/rz-du/rzg2l_mipi_dsi.c index 8fa86ae07fd2..564c15b27c31 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c @@ -28,10 +28,26 @@ =20 #include "rzg2l_mipi_dsi_regs.h" =20 +#define RZ_MIPI_DSI_FEATURE_DPHY_RST BIT(0) + +struct rzg2l_mipi_dsi; + +struct rzg2l_mipi_dsi_hw_info { + int (*dphy_init)(struct rzg2l_mipi_dsi *dsi, unsigned long hsfreq); + void (*dphy_exit)(struct rzg2l_mipi_dsi *dsi); + u32 phy_reg_offset; + u32 link_reg_offset; + unsigned long max_dclk; + unsigned long min_dclk; + u8 features; +}; + struct rzg2l_mipi_dsi { struct device *dev; void __iomem *mmio; =20 + const struct rzg2l_mipi_dsi_hw_info *info; + struct reset_control *rstc; struct reset_control *arstc; struct reset_control *prstc; @@ -164,22 +180,22 @@ static const struct rzg2l_mipi_dsi_timings rzg2l_mipi= _dsi_global_timings[] =3D { =20 static void rzg2l_mipi_dsi_phy_write(struct rzg2l_mipi_dsi *dsi, u32 reg, = u32 data) { - iowrite32(data, dsi->mmio + reg); + iowrite32(data, dsi->mmio + dsi->info->phy_reg_offset + reg); } =20 static void rzg2l_mipi_dsi_link_write(struct rzg2l_mipi_dsi *dsi, u32 reg,= u32 data) { - iowrite32(data, dsi->mmio + LINK_REG_OFFSET + reg); + iowrite32(data, dsi->mmio + dsi->info->link_reg_offset + reg); } =20 static u32 rzg2l_mipi_dsi_phy_read(struct rzg2l_mipi_dsi *dsi, u32 reg) { - return ioread32(dsi->mmio + reg); + return ioread32(dsi->mmio + dsi->info->phy_reg_offset + reg); } =20 static u32 rzg2l_mipi_dsi_link_read(struct rzg2l_mipi_dsi *dsi, u32 reg) { - return ioread32(dsi->mmio + LINK_REG_OFFSET + reg); + return ioread32(dsi->mmio + dsi->info->link_reg_offset + reg); } =20 /* -----------------------------------------------------------------------= ------ @@ -291,7 +307,7 @@ static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi= *dsi, vclk_rate =3D clk_get_rate(dsi->vclk); hsfreq =3D DIV_ROUND_CLOSEST_ULL(vclk_rate * bpp, dsi->lanes); =20 - ret =3D rzg2l_mipi_dsi_dphy_init(dsi, hsfreq); + ret =3D dsi->info->dphy_init(dsi, hsfreq); if (ret < 0) goto err_phy; =20 @@ -334,7 +350,7 @@ static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi= *dsi, return 0; =20 err_phy: - rzg2l_mipi_dsi_dphy_exit(dsi); + dsi->info->dphy_exit(dsi); pm_runtime_put(dsi->dev); =20 return ret; @@ -342,7 +358,7 @@ static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi= *dsi, =20 static void rzg2l_mipi_dsi_stop(struct rzg2l_mipi_dsi *dsi) { - rzg2l_mipi_dsi_dphy_exit(dsi); + dsi->info->dphy_exit(dsi); pm_runtime_put(dsi->dev); } =20 @@ -584,10 +600,12 @@ rzg2l_mipi_dsi_bridge_mode_valid(struct drm_bridge *b= ridge, const struct drm_display_info *info, const struct drm_display_mode *mode) { - if (mode->clock > 148500) + struct rzg2l_mipi_dsi *dsi =3D bridge_to_rzg2l_mipi_dsi(bridge); + + if (mode->clock > dsi->info->max_dclk) return MODE_CLOCK_HIGH; =20 - if (mode->clock < 5803) + if (mode->clock < dsi->info->min_dclk) return MODE_CLOCK_LOW; =20 return MODE_OK; @@ -713,6 +731,8 @@ static int rzg2l_mipi_dsi_probe(struct platform_device = *pdev) platform_set_drvdata(pdev, dsi); dsi->dev =3D &pdev->dev; =20 + dsi->info =3D of_device_get_match_data(&pdev->dev); + ret =3D drm_of_get_data_lanes_count_ep(dsi->dev->of_node, 1, 0, 1, 4); if (ret < 0) return dev_err_probe(dsi->dev, ret, @@ -728,10 +748,12 @@ static int rzg2l_mipi_dsi_probe(struct platform_devic= e *pdev) if (IS_ERR(dsi->vclk)) return PTR_ERR(dsi->vclk); =20 - dsi->rstc =3D devm_reset_control_get_exclusive(dsi->dev, "rst"); - if (IS_ERR(dsi->rstc)) - return dev_err_probe(dsi->dev, PTR_ERR(dsi->rstc), - "failed to get rst\n"); + if (dsi->info->features & RZ_MIPI_DSI_FEATURE_DPHY_RST) { + dsi->rstc =3D devm_reset_control_get_exclusive(dsi->dev, "rst"); + if (IS_ERR(dsi->rstc)) + return dev_err_probe(dsi->dev, PTR_ERR(dsi->rstc), + "failed to get rst\n"); + } =20 dsi->arstc =3D devm_reset_control_get_exclusive(dsi->dev, "arst"); if (IS_ERR(dsi->arstc)) @@ -756,13 +778,13 @@ static int rzg2l_mipi_dsi_probe(struct platform_devic= e *pdev) * mode->clock and format are not available. So initialize DPHY with * timing parameters for 80Mbps. */ - ret =3D rzg2l_mipi_dsi_dphy_init(dsi, 80000000); + ret =3D dsi->info->dphy_init(dsi, 80000000); if (ret < 0) goto err_phy; =20 txsetr =3D rzg2l_mipi_dsi_link_read(dsi, TXSETR); dsi->num_data_lanes =3D min(((txsetr >> 16) & 3) + 1, num_data_lanes); - rzg2l_mipi_dsi_dphy_exit(dsi); + dsi->info->dphy_exit(dsi); pm_runtime_put(dsi->dev); =20 /* Initialize the DRM bridge. */ @@ -779,7 +801,7 @@ static int rzg2l_mipi_dsi_probe(struct platform_device = *pdev) return 0; =20 err_phy: - rzg2l_mipi_dsi_dphy_exit(dsi); + dsi->info->dphy_exit(dsi); pm_runtime_put(dsi->dev); err_pm_disable: pm_runtime_disable(dsi->dev); @@ -794,8 +816,17 @@ static void rzg2l_mipi_dsi_remove(struct platform_devi= ce *pdev) pm_runtime_disable(&pdev->dev); } =20 +static const struct rzg2l_mipi_dsi_hw_info rzg2l_mipi_dsi_info =3D { + .dphy_init =3D rzg2l_mipi_dsi_dphy_init, + .dphy_exit =3D rzg2l_mipi_dsi_dphy_exit, + .link_reg_offset =3D 0x10000, + .max_dclk =3D 148500, + .min_dclk =3D 5803, + .features =3D RZ_MIPI_DSI_FEATURE_DPHY_RST, +}; + static const struct of_device_id rzg2l_mipi_dsi_of_table[] =3D { - { .compatible =3D "renesas,rzg2l-mipi-dsi" }, + { .compatible =3D "renesas,rzg2l-mipi-dsi", .data =3D &rzg2l_mipi_dsi_inf= o, }, { /* sentinel */ } }; =20 diff --git a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h b/drivers/= gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h index 1dbc16ec64a4..16efe4dc59f4 100644 --- a/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h +++ b/drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h @@ -41,8 +41,6 @@ #define DSIDPHYTIM3_THS_ZERO(x) ((x) << 0) =20 /* --------------------------------------------------------*/ -/* Link Registers */ -#define LINK_REG_OFFSET 0x10000 =20 /* Link Status Register */ #define LINKSR 0x10 --=20 2.49.0