Skip to content

Commit 2782622

Browse files
Maciej Purskidaeinki
authored andcommitted
drm/exynos: rename bridge_node to in_bridge_node
Driver uses bridge_node to refer to bridge on input side of DSI. Since we want to add support for bridges on output side lets add "in" prefix to avoid confusion with out bridges. Changes in v5: - replace mic_ prefix with in_ Signed-off-by: Maciej Purski <m.purski@samsung.com> [ a.hajda@samsuung.com: v5 ] Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
1 parent 0320ac5 commit 2782622

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/gpu/drm/exynos/exynos_drm_dsi.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ struct exynos_dsi {
279279
struct list_head transfer_list;
280280

281281
const struct exynos_dsi_driver_data *driver_data;
282-
struct device_node *bridge_node;
282+
struct device_node *in_bridge_node;
283283
};
284284

285285
#define host_to_dsi(host) container_of(host, struct exynos_dsi, dsi_host)
@@ -1634,7 +1634,7 @@ static int exynos_dsi_parse_dt(struct exynos_dsi *dsi)
16341634
if (ret < 0)
16351635
return ret;
16361636

1637-
dsi->bridge_node = of_graph_get_remote_node(node, DSI_PORT_IN, 0);
1637+
dsi->in_bridge_node = of_graph_get_remote_node(node, DSI_PORT_IN, 0);
16381638

16391639
return 0;
16401640
}
@@ -1645,7 +1645,7 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
16451645
struct drm_encoder *encoder = dev_get_drvdata(dev);
16461646
struct exynos_dsi *dsi = encoder_to_dsi(encoder);
16471647
struct drm_device *drm_dev = data;
1648-
struct drm_bridge *bridge;
1648+
struct drm_bridge *in_bridge;
16491649
int ret;
16501650

16511651
drm_encoder_init(drm_dev, encoder, &exynos_dsi_encoder_funcs,
@@ -1664,10 +1664,10 @@ static int exynos_dsi_bind(struct device *dev, struct device *master,
16641664
return ret;
16651665
}
16661666

1667-
if (dsi->bridge_node) {
1668-
bridge = of_drm_find_bridge(dsi->bridge_node);
1669-
if (bridge)
1670-
drm_bridge_attach(encoder, bridge, NULL);
1667+
if (dsi->in_bridge_node) {
1668+
in_bridge = of_drm_find_bridge(dsi->in_bridge_node);
1669+
if (in_bridge)
1670+
drm_bridge_attach(encoder, in_bridge, NULL);
16711671
}
16721672

16731673
return mipi_dsi_host_register(&dsi->dsi_host);
@@ -1786,7 +1786,7 @@ static int exynos_dsi_remove(struct platform_device *pdev)
17861786
{
17871787
struct exynos_dsi *dsi = platform_get_drvdata(pdev);
17881788

1789-
of_node_put(dsi->bridge_node);
1789+
of_node_put(dsi->in_bridge_node);
17901790

17911791
pm_runtime_disable(&pdev->dev);
17921792

0 commit comments

Comments
 (0)