1 files changed, 41 insertions, 0 deletions

diff --git a/drivers/video/fbdev/omap2/dss/hdmi_common.c b/drivers/video/fbdev/omap2/dss/hdmi_common.c
index 0b12a3f62fe1..9a2c39cf297f 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_common.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_common.c
@@ -17,6 +17,7 @@
 
 #include <linux/kernel.h>
 #include <linux/err.h>
+#include <linux/of.h>
 #include <video/omapdss.h>
 
 #include "hdmi.h"
@@ -323,6 +324,46 @@ end:
         return cm;
 }
 
+int hdmi_parse_lanes_of(struct platform_device *pdev, struct device_node *ep,
+        struct hdmi_phy_data *phy)
+{
+        struct property *prop;
+        int r, len;
+
+        prop = of_find_property(ep, "lanes", &len);
+        if (prop) {
+                u32 lanes[8];
+
+                if (len / sizeof(u32) != ARRAY_SIZE(lanes)) {
+                        dev_err(&pdev->dev, "bad number of lanes\n");
+                        return -EINVAL;
+                }
+
+                r = of_property_read_u32_array(ep, "lanes", lanes,
+                        ARRAY_SIZE(lanes));
+                if (r) {
+                        dev_err(&pdev->dev, "failed to read lane data\n");
+                        return r;
+                }
+
+                r = hdmi_phy_parse_lanes(phy, lanes);
+                if (r) {
+                        dev_err(&pdev->dev, "failed to parse lane data\n");
+                        return r;
+                }
+        } else {
+                static const u32 default_lanes[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+
+                r = hdmi_phy_parse_lanes(phy, default_lanes);
+                if (WARN_ON(r)) {
+                        dev_err(&pdev->dev, "failed to parse lane data\n");
+                        return r;
+                }
+        }
+
+        return 0;
+}
+
 #if defined(CONFIG_OMAP4_DSS_HDMI_AUDIO)
 int hdmi_compute_acr(u32 pclk, u32 sample_freq, u32 *n, u32 *cts)
 {