This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1.
---
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 01f46d9189c1..53a5da6c49dd 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)
--
2.34.1
This reverts commit 7328736d270aa4fa6fcd033ade02acc2874a2db5.
---
.../display/bridge/analogix,anx7625.yaml | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
index 4590186c4a0b..35a48515836e 100644
--- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
@@ -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>;
};
};
--
2.34.1
On Mon, 23 May 2022 at 10:46, Robert Foss <[email protected]> wrote:
>
> This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1.
> ---
> 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 01f46d9189c1..53a5da6c49dd 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)
> --
> 2.34.1
>
Signed-off-by: Robert Foss <[email protected]>
On Mon, 23 May 2022 at 10:46, Robert Foss <[email protected]> wrote:
>
> This reverts commit 7328736d270aa4fa6fcd033ade02acc2874a2db5.
> ---
> .../display/bridge/analogix,anx7625.yaml | 19 +------------------
> 1 file changed, 1 insertion(+), 18 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
> index 4590186c4a0b..35a48515836e 100644
> --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
> +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
> @@ -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>;
> };
> };
>
> --
> 2.34.1
>
Signed-off-by: Robert Foss <[email protected]>
These two patches need to be reverted since they were part (3/4 & 4/4)
of a series, that was partially (1/4 + 2/4) on the linux-media tree.
These two patches depend on the patches in the media tree, and will
not build without them, which leaves linux-drm-misc-next in a broken
state. Let's revert the two latter patches until rc1 has been branched
and the dependency wont cause issues any more.
On Mon, 23 May 2022 at 14:50, Robert Foss <[email protected]> wrote:
>
> On Mon, 23 May 2022 at 10:46, Robert Foss <[email protected]> wrote:
> >
> > This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1.
> > ---
> > 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 01f46d9189c1..53a5da6c49dd 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)
> > --
> > 2.34.1
> >
>
> Signed-off-by: Robert Foss <[email protected]>
On Mon, 23 May 2022 at 14:54, Robert Foss <[email protected]> wrote:
>
> These two patches need to be reverted since they were part (3/4 & 4/4)
> of a series, that was partially (1/4 + 2/4) on the linux-media tree.
> These two patches depend on the patches in the media tree, and will
> not build without them, which leaves linux-drm-misc-next in a broken
> state. Let's revert the two latter patches until rc1 has been branched
> and the dependency wont cause issues any more.
>
> On Mon, 23 May 2022 at 14:50, Robert Foss <[email protected]> wrote:
> >
> > On Mon, 23 May 2022 at 10:46, Robert Foss <[email protected]> wrote:
> > >
> > > This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1.
> > > ---
> > > 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 01f46d9189c1..53a5da6c49dd 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)
> > > --
> > > 2.34.1
> > >
> >
> > Signed-off-by: Robert Foss <[email protected]>
Acked-by: Daniel Vetter <[email protected]>
On Mon, 23 May 2022 at 14:54, Robert Foss <[email protected]> wrote:
> These two patches need to be reverted since they were part (3/4 & 4/4)
> of a series, that was partially (1/4 + 2/4) on the linux-media tree.
> These two patches depend on the patches in the media tree, and will
> not build without them, which leaves linux-drm-misc-next in a broken
> state. Let's revert the two latter patches until rc1 has been branched
"rc1 has been backmerged into drm-misc-next" is missing here.
> and the dependency wont cause issues any more.
With explainer and sob added to both:
Acked-by: Daniel Vetter <[email protected]>
>
> On Mon, 23 May 2022 at 14:50, Robert Foss <[email protected]> wrote:
> >
> > On Mon, 23 May 2022 at 10:46, Robert Foss <[email protected]> wrote:
> > >
> > > This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1.
> > > ---
> > > 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 01f46d9189c1..53a5da6c49dd 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)
> > > --
> > > 2.34.1
> > >
> >
> > Signed-off-by: Robert Foss <[email protected]>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch