Revert "drm/bridge: anx7625: Use DPI bus type"
Subsystems (4)
PATCH v2 1/2 Revert "drm/bridge: anx7625: Use DPI bus type"
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.
--- drivers/gpu/drm/bridge/analogix/anx7625.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/bridge/analogix/anx7625.c +4 -4
@@ -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 )
Signature · 1 line
2.34.1
PATCH v2 2/2 Revert "dt-bindings:drm/bridge:anx7625: add port@0 property"
This reverts commit 7328736d270aa4fa6fcd033ade02acc2874a2db5.
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.
--- .../display/bridge/analogix,anx7625.yaml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml +1 -18
@@ -94,22 +94,7 @@ properties: $ref: /schemas/graph.yaml#/$defs/port-base unevaluatedProperties: false description: - MIPI DSI/DPI input. - - properties: - endpoint: - $ref: /schemas/media/video-interfaces.yaml# - type: object - additionalProperties: false - - properties: - remote-endpoint: true - - bus-type: - enum: [7] - default: 1 - - data-lanes: true + Video port for MIPI DSI input. port@1: $ref: /schemas/graph.yaml#/properties/port
@@ -158,8 +143,6 @@ examples: reg = <0>; anx7625_in: endpoint { remote-endpoint = <&mipi_dsi>; - bus-type = <7>; - data-lanes = <0 1 2 3>; }; };
Signature · 1 line
2.34.1
Quoted 47 lines · Robert Foss
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 <[email protected]>Acked-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/bridge/analogix/anx7625.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/bridge/analogix/anx7625.c +4
-5@@ -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 ) --
Quoted 2 lines
2.34.1
Series applied to drm-misc-next.