| Message ID | 20220523161520.354687-1-robert.foss@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] Revert "drm/bridge: anx7625: Use DPI bus type" | expand |
On Mon, 23 May 2022 at 18:15, Robert Foss <robert.foss@linaro.org> wrote: > > 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> > --- > drivers/gpu/drm/bridge/analogix/anx7625.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c > index 0fab2aa47c67..e92eb4a40745 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) { > @@ -1641,8 +1641,8 @@ static int anx7625_parse_dt(struct device *dev, > of_node_put(ep0); > } > > - 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) > -- > 2.34.1 > Series applied to drm-misc-next.
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 0fab2aa47c67..e92eb4a40745 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) { @@ -1641,8 +1641,8 @@ static int anx7625_parse_dt(struct device *dev, of_node_put(ep0); } - 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)