3 files changed, 65 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index fcb7f5c271c9..0db371a88e5e 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -35,6 +35,8 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
 
 static void __init omap_generic_init(void)
 {
+        omapdss_early_init_of();
+
         pdata_quirks_init(omap_dt_match_table);
 
         omapdss_init_of();
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 1864282dbddf..d88aff7baff8 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -316,6 +316,7 @@ extern int omap_dss_reset(struct omap_hwmod *);
 int omap_clk_init(void);
 
 int __init omapdss_init_of(void);
+void __init omapdss_early_init_of(void);
 
 #endif /* __ASSEMBLER__ */
 #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index a83ada38cae2..cf0cb35fa972 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/slab.h>
 
 #include <video/omapdss.h>
 #include "omap_hwmod.h"
@@ -555,6 +556,67 @@ int omap_dss_reset(struct omap_hwmod *oh)
         return r;
 }
 
+/* list of 'compatible' nodes to convert to omapdss specific */
+static const char * const dss_compat_conv_list[] __initconst = {
+        "composite-connector",
+        "dvi-connector",
+        "hdmi-connector",
+        "panel-dpi",
+        "panel-dsi-cm",
+        "sony,acx565akm",
+        "svideo-connector",
+        "ti,tfp410",
+        "ti,tpd12s015",
+};
+
+/* prepend compatible string with "omapdss," */
+static __init void omapdss_omapify_node(struct device_node *node,
+        const char *compat)
+{
+        char *new_compat;
+        struct property *prop;
+
+        new_compat = kasprintf(GFP_KERNEL, "omapdss,%s", compat);
+
+        prop = kzalloc(sizeof(*prop), GFP_KERNEL);
+
+        if (!prop) {
+                pr_err("omapdss_omapify_node: kzalloc failed\n");
+                return;
+        }
+
+        prop->name = "compatible";
+        prop->value = new_compat;
+        prop->length = strlen(new_compat) + 1;
+
+        of_update_property(node, prop);
+}
+
+/*
+ * As omapdss panel drivers are omapdss specific, but we want to define the
+ * DT-data in generic manner, we convert the compatible strings of the panel
+ * nodes from "panel-foo" to "omapdss,panel-foo". This way we can have both
+ * correct DT data and omapdss specific drivers.
+ *
+ * When we get generic panel drivers to the kernel, this will be removed.
+ */
+void __init omapdss_early_init_of(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(dss_compat_conv_list); ++i) {
+                const char *compat = dss_compat_conv_list[i];
+                struct device_node *node = NULL;
+
+                while ((node = of_find_compatible_node(node, NULL, compat))) {
+                        if (!of_device_is_available(node))
+                                continue;
+
+                        omapdss_omapify_node(node, compat);
+                }
+        }
+}
+
 struct device_node * __init omapdss_find_dss_of_node(void)
 {
         struct device_node *node;