From nobody Thu Dec 18 14:30:31 2025 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 3CDBF238142; Fri, 30 May 2025 16:59:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748624363; cv=none; b=l1fuG51aSnzXz6G2PaAlSyiOhmM0iTPSlGP5ysyydwqDVPoqGwbqnirPug2SXSCyU0X9+iHM8o986lLsB0lTXVUTfKdi1ss85h9J1bXPUF4SfcMqv2gZQ/sVlSNua6fxbZIiMsm2y6gbtQSDI75rJukE6+U+ROpXRY7q1NznVBY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748624363; c=relaxed/simple; bh=Bw8iZTWu8MTaLwyx4ObP0Hf862JZMPN0gK2muh1bNns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iVQtwEMDN5N3D/dz1WJMwSroWitWRkayQ/o+mHTs9Pqqm16bUJrjlq22GWulhtqTVRsypZfzoxUPrTXsDtlOVXKGfFOR+QAW7mU5dJ3aQfmRI+B+55CN4pUGyco7rl91mz1aTxL2jMOiXN4PLXJgejJn9EzRg5ZhfbSzl0DT4gQ= 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=RYMcHvYe; arc=none smtp.client-ip=209.85.128.43 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="RYMcHvYe" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-450cfb79177so11050785e9.0; Fri, 30 May 2025 09:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748624358; x=1749229158; 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=I3L+RIQYCMNrklB64jsd6geUHslrVR/KKInWrov1lsI=; b=RYMcHvYe4MGDQy65Y7BEytXRpwYQf7QC//6oahBsMe563nEJz0+WKhCidpH8Mf0nCx 8BZ/DIxPYb6Oa4GOjhalcqj3/Rkl+oe/OsdrIv3q6LcCUNF2WUMkrK4P3djk38TQMlns sU+lIF3aTkGjXAGdHWeDCy5Ub0Jzd3Eu1dTtsKHl+s9CpkkrSp7DzWoFWZVcAPDfK8FE DxtdxYtmFZ0/iVYUYPxMrQGuqVZxcPNdQjXtb3jiN7dJT3fA1l9gNU3uT59QMElcEqJ7 PXxINSIky1uxXEAmR58OQpRwMqOor1STvsKegVzQ03l/+RHhNJn78G4h/UxLTE060Qxe jzRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748624358; x=1749229158; 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=I3L+RIQYCMNrklB64jsd6geUHslrVR/KKInWrov1lsI=; b=SUSUQS7MfKzEy0WfJxPeOWwI2S/wpIkVs/ucg2TgZFZtIUybXCAG0z5FVKt6qovH2z qzBJ1ZMXevn8KYqwOXyQczgCoNATequ+fkgJ2vYJm4ub4pCT8Ce7Vck1YDHSNW9XIaye M8TIrjjU1gfHHNF3anVoCEHph8/48CGLP/mmzbYqfvf3CAvVCfaqGkCKngEhmHiJikiY iE+kfecWpRDY+slqV7m1AuYn+1f+PfVFvWZAMmLwqW7aNOPdLuDcvyfLeUnk8jfThry/ kw0IxmQ1EtUMTDTFCa6y/EAThha5m46r9cjxy7x3okWBBHcU1eBmJ42HNobSVRt31qzR 5Z5A== X-Forwarded-Encrypted: i=1; AJvYcCUb17VODXU5U09tAtFaKGc9vNDZib0259P5F/vF9lfD3gOmAZZ6nIro8hC9+ylf3idCnKfaLP2BKTI59pc6@vger.kernel.org, AJvYcCXJXLJ5oKBAjRNXuXhNiJJj4ZCcU6upRc2YLQDyiDFKiXGrArDrhs5VEoj209yZSbxlYhYIrSpigfv022brm5/TXIE=@vger.kernel.org, AJvYcCXeLnVsEGcsz4KJCXWz8A24ZlW9Em0Vv3DVBlFy75bR5sli2fQyRyd22KgbGqaTnLkKTK0bI4emp6lD@vger.kernel.org X-Gm-Message-State: AOJu0Yzm4tGYt9/D/A9vDl6XYS5lDdNL9S/GBpC81Po8gKoXoHBSBuXM lU1YjHaI2d5Ocwu8QaH/kQ7fdPaYAWj7XPPyV9C7s2ZoSJUBeAw6IhWx X-Gm-Gg: ASbGncshzAyvyjNM7zK7fK3pOGFSPl2JxXmLZwmsb5GHHyP8marlu2LtbYX4I4ssKk8 Em64Y1G+tvrHzQoIL8/cwbwLU6YLp8/hwd+UcIIaqd+wO8E2XzpbnoaUucw3FTVt75ItBRY3L+S hk84+UQet/XngxD7kH0PH3zRqwB7mXV9keJo6J/QtCZ+N6/CVTlUzQw0e+dCl4BcCB1kfsWV3BA hJhoZJu6sUMNG7oWGqyEzFcZe0E3VX+yrBUXCx4FdZTua/hcG6/MckFX2ESB6WQDtFfAAUiaWZr haBzSpTz9Qyy+MN9vkNek+xRtxe8fFHm7JPB6iLefjF3FBbghfrW9FqlYXvu2GldyB6IISoGLsk ESqupt1aIsB8j3oPQR0Pr X-Google-Smtp-Source: AGHT+IHzh1iAOJwPvcR1JFXJ7Vl6AdbyIp+YhO/RO6sQKIczVAhCjVVCNPw2h/oEmK4cZ16HCgXxiA== X-Received: by 2002:a05:6000:40e0:b0:3a4:f41d:6973 with SMTP id ffacd0b85a97d-3a4f89ad29emr2674715f8f.13.1748624358429; Fri, 30 May 2025 09:59:18 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:bcab:7ec7:2377:13b0]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-450d7f9efa3sm22733455e9.9.2025.05.30.09.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 09:59:17 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Biju Das , Laurent Pinchart , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Geert Uytterhoeven , Magnus Damm Cc: dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 06/12] drm: renesas: rz-du: mipi_dsi: Add OF data support Date: Fri, 30 May 2025 17:59:00 +0100 Message-ID: <20250530165906.411144-7-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530165906.411144-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250530165906.411144-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 Reviewed-by: Biju Das Reviewed-by: Laurent Pinchart --- v5->v6: - Added min_dclk above max_dclk in rzg2l_mipi_dsi_hw_info - Added Reviewed-by tag from Laurent v4->v5: - Dropped RZ_MIPI_DSI_FEATURE_DPHY_RST feature flag - Added Reviewed tag from Biju v3->v4: - No changes 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 | 51 ++++++++++++++----- .../drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 2 - 2 files changed, 38 insertions(+), 15 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 4d4521a231cb..2c03cad66711 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,23 @@ =20 #include "rzg2l_mipi_dsi_regs.h" =20 +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 min_dclk; + unsigned long max_dclk; +}; + 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 +177,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 /* -----------------------------------------------------------------------= ------ @@ -294,7 +307,7 @@ static int rzg2l_mipi_dsi_startup(struct rzg2l_mipi_dsi= *dsi, mode->clock * KILO, vclk_rate); 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 @@ -337,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; @@ -345,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 @@ -588,10 +601,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; @@ -717,6 +732,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, @@ -760,13 +777,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. */ @@ -783,7 +800,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); @@ -798,8 +815,16 @@ 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, + .min_dclk =3D 5803, + .max_dclk =3D 148500, +}; + 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