From: Marek Vasut <marex@denx.de>
To: dri-devel@lists.freedesktop.org
Cc: Marek Vasut <marex@denx.de>, Robert Foss <robert.foss@linaro.org>,
Jagan Teki <jagan@amarulasolutions.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Sam Ravnborg <sam@ravnborg.org>,
Maxime Ripard <maxime@cerno.tech>
Subject: [PATCH V2 04/12] drm: bridge: icn6211: Add DSI lane count DT property parsing
Date: Thu, 17 Feb 2022 01:25:22 +0100 [thread overview]
Message-ID: <20220217002530.396563-5-marex@denx.de> (raw)
In-Reply-To: <20220217002530.396563-1-marex@denx.de>
The driver currently hard-codes DSI lane count to two, however the chip
is capable of operating in 1..4 DSI lanes mode. Parse 'data-lanes' DT
property and program the result into DSI_CTRL register.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Maxime Ripard <maxime@cerno.tech>
Cc: Robert Foss <robert.foss@linaro.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
To: dri-devel@lists.freedesktop.org
---
V2: Rebase on next-20220214
---
drivers/gpu/drm/bridge/chipone-icn6211.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
index 2ac8eb7e25f52..7c013a08c7b00 100644
--- a/drivers/gpu/drm/bridge/chipone-icn6211.c
+++ b/drivers/gpu/drm/bridge/chipone-icn6211.c
@@ -136,10 +136,12 @@ struct chipone {
struct drm_bridge bridge;
struct drm_display_mode mode;
struct drm_bridge *panel_bridge;
+ struct device_node *host_node;
struct gpio_desc *enable_gpio;
struct regulator *vdd1;
struct regulator *vdd2;
struct regulator *vdd3;
+ int dsi_lanes;
};
static inline struct chipone *bridge_to_chipone(struct drm_bridge *bridge)
@@ -212,6 +214,11 @@ static void chipone_atomic_enable(struct drm_bridge *bridge,
/* dsi specific sequence */
ICN6211_DSI(icn, SYNC_EVENT_DLY, 0x80);
ICN6211_DSI(icn, HFP_MIN, hfp & 0xff);
+
+ /* DSI data lane count */
+ ICN6211_DSI(icn, DSI_CTRL,
+ DSI_CTRL_UNKNOWN | DSI_CTRL_DSI_LANES(icn->dsi_lanes - 1));
+
ICN6211_DSI(icn, MIPI_PD_CK_LANE, 0xa0);
ICN6211_DSI(icn, PLL_CTRL(12), 0xff);
@@ -314,6 +321,7 @@ static const struct drm_bridge_funcs chipone_bridge_funcs = {
static int chipone_parse_dt(struct chipone *icn)
{
struct device *dev = icn->dev;
+ struct device_node *endpoint;
struct drm_panel *panel;
int ret;
@@ -350,6 +358,16 @@ static int chipone_parse_dt(struct chipone *icn)
return PTR_ERR(icn->enable_gpio);
}
+ endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 0, 0);
+ icn->dsi_lanes = of_property_count_u32_elems(endpoint, "data-lanes");
+ icn->host_node = of_graph_get_remote_port_parent(endpoint);
+ of_node_put(endpoint);
+
+ if (icn->dsi_lanes < 0 || icn->dsi_lanes > 4)
+ return -EINVAL;
+ if (!icn->host_node)
+ return -ENODEV;
+
ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL);
if (ret)
return ret;
@@ -384,7 +402,7 @@ static int chipone_probe(struct mipi_dsi_device *dsi)
drm_bridge_add(&icn->bridge);
- dsi->lanes = 4;
+ dsi->lanes = icn->dsi_lanes;
dsi->format = MIPI_DSI_FMT_RGB888;
dsi->mode_flags = MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
@@ -403,6 +421,7 @@ static int chipone_remove(struct mipi_dsi_device *dsi)
mipi_dsi_detach(dsi);
drm_bridge_remove(&icn->bridge);
+ of_node_put(icn->host_node);
return 0;
}
--
2.34.1
next prev parent reply other threads:[~2022-02-17 0:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 0:25 [PATCH V2 00/12] drm: bridge: icn6211: Fix hard-coded panel settings and add I2C support Marek Vasut
2022-02-17 0:25 ` [PATCH V2 01/12] drm: bridge: icn6211: Fix register layout Marek Vasut
2022-03-02 9:55 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 02/12] drm: bridge: icn6211: Fix HFP_HSW_HBP_HI and HFP_MIN handling Marek Vasut
2022-03-02 9:56 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 03/12] drm: bridge: icn6211: Add HS/VS/DE polarity handling Marek Vasut
2022-03-02 9:59 ` Maxime Ripard
2022-03-02 14:45 ` Marek Vasut
2022-02-17 0:25 ` Marek Vasut [this message]
2022-03-02 10:01 ` [PATCH V2 04/12] drm: bridge: icn6211: Add DSI lane count DT property parsing Maxime Ripard
2022-03-02 15:17 ` Marek Vasut
2022-03-03 12:54 ` Maxime Ripard
2022-03-04 0:26 ` Marek Vasut
2022-02-17 0:25 ` [PATCH V2 05/12] drm: bridge: icn6211: Add generic DSI-to-DPI PLL configuration Marek Vasut
2022-03-02 10:02 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 06/12] drm: bridge: icn6211: Use DSI burst mode without EoT and with LP command mode Marek Vasut
2022-03-02 10:03 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 07/12] drm: bridge: icn6211: Disable DPI color swap Marek Vasut
2022-03-02 10:04 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 08/12] drm: bridge: icn6211: Set SYS_CTRL_1 to value used in examples Marek Vasut
2022-03-02 10:04 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 09/12] drm: bridge: icn6211: Implement atomic_get_input_bus_fmts Marek Vasut
2022-03-02 10:05 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 10/12] drm: bridge: icn6211: Add I2C configuration support Marek Vasut
2022-03-02 10:07 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 11/12] drm: bridge: icn6211: Rework ICN6211_DSI to chipone_writeb() Marek Vasut
2022-03-02 10:08 ` Maxime Ripard
2022-02-17 0:25 ` [PATCH V2 12/12] drm: bridge: icn6211: Read and validate chip IDs before configuration Marek Vasut
2022-03-02 10:08 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220217002530.396563-5-marex@denx.de \
--to=marex@denx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=jagan@amarulasolutions.com \
--cc=maxime@cerno.tech \
--cc=robert.foss@linaro.org \
--cc=sam@ravnborg.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox