4 files changed, 37 insertions, 19 deletions

diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index d0f82da59ac5..04d6ecdd314c 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -469,10 +469,10 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,
                 return 0;
 
         v4l2_of_parse_endpoint(ep, &endpoint);
-        if (WARN_ON(endpoint.port == 0) || index >= FIMC_MAX_SENSORS)
+        if (WARN_ON(endpoint.base.port == 0) || index >= FIMC_MAX_SENSORS)
                 return -EINVAL;
 
-        pd->mux_id = (endpoint.port - 1) & 0x1;
+        pd->mux_id = (endpoint.base.port - 1) & 0x1;
 
         rem = of_graph_get_remote_port_parent(ep);
         of_node_put(ep);
@@ -494,13 +494,13 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,
                 return -EINVAL;
         }
 
-        if (fimc_input_is_parallel(endpoint.port)) {
+        if (fimc_input_is_parallel(endpoint.base.port)) {
                 if (endpoint.bus_type == V4L2_MBUS_PARALLEL)
                         pd->sensor_bus_type = FIMC_BUS_TYPE_ITU_601;
                 else
                         pd->sensor_bus_type = FIMC_BUS_TYPE_ITU_656;
                 pd->flags = endpoint.bus.parallel.flags;
-        } else if (fimc_input_is_mipi_csi(endpoint.port)) {
+        } else if (fimc_input_is_mipi_csi(endpoint.base.port)) {
                 /*
                  * MIPI CSI-2: only input mux selection and
                  * the sensor's clock frequency is needed.
@@ -508,7 +508,7 @@ static int fimc_md_parse_port_node(struct fimc_md *fmd,
                 pd->sensor_bus_type = FIMC_BUS_TYPE_MIPI_CSI2;
         } else {
                 v4l2_err(&fmd->v4l2_dev, "Wrong port id (%u) at node %s\n",
-                         endpoint.port, rem->full_name);
+                         endpoint.base.port, rem->full_name);
         }
         /*
          * For FIMC-IS handled sensors, that are placed under i2c-isp device
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index fd1ae6549607..3678ba59725c 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -772,7 +772,7 @@ static int s5pcsis_parse_dt(struct platform_device *pdev,
         /* Get port node and validate MIPI-CSI channel id. */
         v4l2_of_parse_endpoint(node, &endpoint);
 
-        state->index = endpoint.port - FIMC_INPUT_MIPI_CSI2_0;
+        state->index = endpoint.base.port - FIMC_INPUT_MIPI_CSI2_0;
         if (state->index < 0 || state->index >= CSIS_MAX_ENTITIES)
                 return -ENXIO;
 
diff --git a/drivers/media/v4l2-core/v4l2-of.c b/drivers/media/v4l2-core/v4l2-of.c
index f919db358bbe..b4ed9a955fbe 100644
--- a/drivers/media/v4l2-core/v4l2-of.c
+++ b/drivers/media/v4l2-core/v4l2-of.c
@@ -127,17 +127,9 @@ static void v4l2_of_parse_parallel_bus(const struct device_node *node,
 int v4l2_of_parse_endpoint(const struct device_node *node,
                            struct v4l2_of_endpoint *endpoint)
 {
-        struct device_node *port_node = of_get_parent(node);
-
-        memset(endpoint, 0, offsetof(struct v4l2_of_endpoint, head));
-
-        endpoint->local_node = node;
-        /*
-         * It doesn't matter whether the two calls below succeed.
-         * If they don't then the default value 0 is used.
-         */
-        of_property_read_u32(port_node, "reg", &endpoint->port);
-        of_property_read_u32(node, "reg", &endpoint->id);
+        of_graph_parse_endpoint(node, &endpoint->base);
+        endpoint->bus_type = 0;
+        memset(&endpoint->bus, 0, sizeof(endpoint->bus));
 
         v4l2_of_parse_csi_bus(node, endpoint);
         /*
@@ -147,8 +139,6 @@ int v4l2_of_parse_endpoint(const struct device_node *node,
         if (endpoint->bus.mipi_csi2.flags == 0)
                 v4l2_of_parse_parallel_bus(node, endpoint);
 
-        of_node_put(port_node);
-
         return 0;
 }
 EXPORT_SYMBOL(v4l2_of_parse_endpoint);
diff --git a/drivers/of/base.c b/drivers/of/base.c
index a8e47d37cc7f..715144af3a83 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1985,6 +1985,34 @@ struct device_node *of_find_next_cache_node(const struct device_node *np)
 }
 
 /**
+ * of_graph_parse_endpoint() - parse common endpoint node properties
+ * @node: pointer to endpoint device_node
+ * @endpoint: pointer to the OF endpoint data structure
+ *
+ * The caller should hold a reference to @node.
+ */
+int of_graph_parse_endpoint(const struct device_node *node,
+                            struct of_endpoint *endpoint)
+{
+        struct device_node *port_node = of_get_parent(node);
+
+        memset(endpoint, 0, sizeof(*endpoint));
+
+        endpoint->local_node = node;
+        /*
+         * It doesn't matter whether the two calls below succeed.
+         * If they don't then the default value 0 is used.
+         */
+        of_property_read_u32(port_node, "reg", &endpoint->port);
+        of_property_read_u32(node, "reg", &endpoint->id);
+
+        of_node_put(port_node);
+
+        return 0;
+}
+EXPORT_SYMBOL(of_graph_parse_endpoint);
+
+/**
  * of_graph_get_next_endpoint() - get next endpoint node
  * @parent: pointer to the parent device node
  * @prev: previous endpoint node, or NULL to get first