diff options
| author | Robert Foss <robert.foss@linaro.org> | 2022-05-23 18:15:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-17 15:16:18 +0200 |
| commit | 62ceb22d7770e2a32ef8d4517f8393d7e2de1d87 (patch) | |
| tree | e1f38887261fa520c812cba526f0341c59f9edc2 | |
| parent | ee3f18d90e80e79449d575fa3e7a6b775e9fc35e (diff) | |
| download | linux-stable-62ceb22d7770e2a32ef8d4517f8393d7e2de1d87.tar.gz linux-stable-62ceb22d7770e2a32ef8d4517f8393d7e2de1d87.tar.bz2 linux-stable-62ceb22d7770e2a32ef8d4517f8393d7e2de1d87.zip | |
Revert "drm/bridge: anx7625: Use DPI bus type"
commit 61922beba36adea8702fe8069b309c806f6608af upstream.
This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1.
This patch depends on the patches just aplied to the media tree, and will
not build without them, which leaves drm-misc-next in a broken state.
Let's revert the two latter patches until rc1 has been branched,
and rc1 has been backmerged into drm-misc-next.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220523161520.354687-1-robert.foss@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/bridge/analogix/anx7625.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 183bd065c494..d5f6686b7603 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1623,14 +1623,14 @@ static int anx7625_parse_dt(struct device *dev, anx7625_get_swing_setting(dev, pdata); - pdata->is_dpi = 0; /* default dsi mode */ + pdata->is_dpi = 1; /* default dpi mode */ pdata->mipi_host_node = of_graph_get_remote_node(np, 0, 0); if (!pdata->mipi_host_node) { DRM_DEV_ERROR(dev, "fail to get internal panel.\n"); return -ENODEV; } - bus_type = 0; + bus_type = V4L2_FWNODE_BUS_TYPE_PARALLEL; mipi_lanes = MAX_LANES_SUPPORT; ep0 = of_graph_get_endpoint_by_regs(np, 0, 0); if (ep0) { @@ -1640,8 +1640,8 @@ static int anx7625_parse_dt(struct device *dev, mipi_lanes = of_property_count_u32_elems(ep0, "data-lanes"); } - if (bus_type == V4L2_FWNODE_BUS_TYPE_DPI) /* bus type is DPI */ - pdata->is_dpi = 1; + if (bus_type == V4L2_FWNODE_BUS_TYPE_PARALLEL) /* bus type is Parallel(DSI) */ + pdata->is_dpi = 0; pdata->mipi_lanes = mipi_lanes; if (pdata->mipi_lanes > MAX_LANES_SUPPORT || pdata->mipi_lanes <= 0) |