Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / media / v4l2-core / v4l2-of.c

diff --git a/drivers/media/v4l2-core/v4l2-of.c b/drivers/media/v4l2-core/v4l2-of.c
index 93b33681776ca427703dee8bbf6616cca95d7938..4f59f442dd0a64c9003873f11c0658d2e258eb6b 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-of.c
+++ b/drivers/media/v4l2-core/v4l2-of.c
@@ -26,7 +26,7 @@ static int v4l2_of_parse_csi_bus(const struct device_node *node,
        struct v4l2_of_bus_mipi_csi2 *bus = &endpoint->bus.mipi_csi2;
        struct property *prop;
        bool have_clk_lane = false;
-       unsigned int flags = 0;
+       unsigned int flags = 0, lanes_used = 0;
        u32 v;
 
        prop = of_find_property(node, "data-lanes", NULL);
@@ -38,6 +38,12 @@ static int v4l2_of_parse_csi_bus(const struct device_node *node,
                        lane = of_prop_next_u32(prop, lane, &v);
                        if (!lane)
                                break;
+
+                       if (lanes_used & BIT(v))
+                               pr_warn("%s: duplicated lane %u in data-lanes\n",
+                                       node->full_name, v);
+                       lanes_used |= BIT(v);
+
                        bus->data_lanes[i] = v;
                }
                bus->num_data_lanes = i;
@@ -63,6 +69,11 @@ static int v4l2_of_parse_csi_bus(const struct device_node *node,
        }
 
        if (!of_property_read_u32(node, "clock-lanes", &v)) {
+               if (lanes_used & BIT(v))
+                       pr_warn("%s: duplicated lane %u in clock-lanes\n",
+                               node->full_name, v);
+               lanes_used |= BIT(v);
+
                bus->clock_lane = v;
                have_clk_lane = true;
        }