@@ -175,7 +175,7 @@ static void armada_add_endpoints(struct device *dev,
{
struct device_node *ep, *remote;
- for_each_endpoint_of_node(dev_node, ep) {
+ for_each_device_endpoint_of_node(dev_node, ep) {
remote = of_graph_get_remote_port_parent(ep);
if (remote && of_device_is_available(remote))
drm_of_component_match_add(dev, match, component_compare_of,
@@ -2190,7 +2190,7 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc)
* DSI -> port@0 -> port@1 -> DPI :: [port@2 is not connected]
*/
- for_each_endpoint_of_node(dev->of_node, node) {
+ for_each_device_endpoint_of_node(dev->of_node, node) {
of_graph_parse_endpoint(node, &endpoint);
if (endpoint.port > 2) {
of_node_put(node);
@@ -63,7 +63,7 @@ uint32_t drm_of_find_possible_crtcs(struct drm_device *dev,
struct device_node *remote_port, *ep;
uint32_t possible_crtcs = 0;
- for_each_endpoint_of_node(port, ep) {
+ for_each_device_endpoint_of_node(port, ep) {
remote_port = of_graph_get_remote_port(ep);
if (!remote_port) {
of_node_put(ep);
@@ -203,7 +203,7 @@ int drm_of_encoder_active_endpoint(struct device_node *node,
if (!node || !crtc)
return -EINVAL;
- for_each_endpoint_of_node(node, ep) {
+ for_each_device_endpoint_of_node(node, ep) {
port = of_graph_get_remote_port(ep);
of_node_put(port);
if (port == crtc->port) {
@@ -516,7 +516,7 @@ struct mipi_dsi_host *drm_of_get_dsi_bus(struct device *dev)
/*
* Get first endpoint child from device.
*/
- endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
+ endpoint = of_graph_get_next_device_endpoint(dev->of_node, NULL);
if (!endpoint)
return ERR_PTR(-ENODEV);
@@ -113,7 +113,7 @@ static bool meson_vpu_has_available_connectors(struct device *dev)
struct device_node *ep, *remote;
/* Parses each endpoint and check if remote exists */
- for_each_endpoint_of_node(dev->of_node, ep) {
+ for_each_device_endpoint_of_node(dev->of_node, ep) {
/* If the endpoint node exists, consider it enabled */
remote = of_graph_get_remote_port(ep);
if (remote) {
@@ -481,7 +481,7 @@ static int meson_drv_probe(struct platform_device *pdev)
struct device_node *ep, *remote;
int count = 0;
- for_each_endpoint_of_node(np, ep) {
+ for_each_device_endpoint_of_node(np, ep) {
remote = of_graph_get_remote_port_parent(ep);
if (!remote || !of_device_is_available(remote)) {
of_node_put(remote);
@@ -840,7 +840,7 @@ static int add_components_mdp(struct device *master_dev,
struct device_node *np = master_dev->of_node;
struct device_node *ep_node;
- for_each_endpoint_of_node(np, ep_node) {
+ for_each_device_endpoint_of_node(np, ep_node) {
struct device_node *intf;
struct of_endpoint ep;
int ret;
@@ -51,7 +51,7 @@ static int lcdif_attach_bridge(struct lcdif_drm_private *lcdif)
struct drm_bridge *bridge;
int ret;
- for_each_endpoint_of_node(dev->of_node, ep) {
+ for_each_device_endpoint_of_node(dev->of_node, ep) {
struct device_node *remote;
struct of_endpoint of_ep;
struct drm_encoder *encoder;
@@ -243,7 +243,7 @@ static void omapdss_walk_device(struct device *dev, struct device_node *node,
of_node_put(n);
n = NULL;
- while ((n = of_graph_get_next_endpoint(node, n)) != NULL) {
+ while ((n = of_graph_get_next_device_endpoint(node, n)) != NULL) {
struct device_node *pn = of_graph_get_remote_port_parent(n);
if (!pn)
@@ -400,7 +400,7 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c)
rpi_touchscreen_i2c_write(ts, REG_POWERON, 0);
/* Look up the DSI host. It needs to probe before we do. */
- endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
+ endpoint = of_graph_get_next_device_endpoint(dev->of_node, NULL);
if (!endpoint)
return -ENODEV;
@@ -93,7 +93,7 @@ static int pl111_modeset_init(struct drm_device *dev)
mode_config->max_height = 768;
i = 0;
- for_each_endpoint_of_node(np, remote) {
+ for_each_device_endpoint_of_node(np, remote) {
struct drm_panel *tmp_panel;
struct drm_bridge *tmp_bridge;
@@ -609,7 +609,7 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu)
* Iterate over the endpoints and create one encoder for each output
* pipeline.
*/
- for_each_endpoint_of_node(np, ep_node) {
+ for_each_device_endpoint_of_node(np, ep_node) {
enum rcar_du_output output;
struct of_endpoint ep;
unsigned int i;
@@ -1931,7 +1931,7 @@ int ltdc_load(struct drm_device *ddev)
DRM_DEBUG_DRIVER("\n");
/* Get number of endpoints */
- nb_endpoints = of_graph_get_endpoint_count(np);
+ nb_endpoints = of_graph_get_device_endpoint_count(np);
if (!nb_endpoints)
return -ENODEV;
@@ -2087,7 +2087,7 @@ void ltdc_unload(struct drm_device *ddev)
DRM_DEBUG_DRIVER("\n");
- nb_endpoints = of_graph_get_endpoint_count(dev->of_node);
+ nb_endpoints = of_graph_get_device_endpoint_count(dev->of_node);
for (i = 0; i < nb_endpoints; i++)
drm_of_panel_bridge_remove(ddev->dev->of_node, 0, i);
@@ -288,7 +288,7 @@ static int arcpgu_load(struct arcpgu_drm_private *arcpgu)
* There is only one output port inside each device. It is linked with
* encoder endpoint.
*/
- endpoint_node = of_graph_get_next_endpoint(pdev->dev.of_node, NULL);
+ endpoint_node = of_graph_get_next_device_endpoint(pdev->dev.of_node, NULL);
if (endpoint_node) {
encoder_node = of_graph_get_remote_port_parent(endpoint_node);
of_node_put(endpoint_node);
of_graph_get_next_endpoint() is now renamed to of_graph_get_next_device_endpoint(). Switch to it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- drivers/gpu/drm/armada/armada_drv.c | 2 +- drivers/gpu/drm/bridge/tc358767.c | 2 +- drivers/gpu/drm/drm_of.c | 6 +++--- drivers/gpu/drm/meson/meson_drv.c | 4 ++-- drivers/gpu/drm/msm/msm_drv.c | 2 +- drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- drivers/gpu/drm/omapdrm/dss/base.c | 2 +- drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 4 ++-- drivers/gpu/drm/tiny/arcpgu.c | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-)