These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / mach-omap2 / display.c

diff --git a/kernel/arch/arm/mach-omap2/display.c b/kernel/arch/arm/mach-omap2/display.c
index f492ae1..6ab13d1 100644 (file)
--- a/kernel/arch/arm/mach-omap2/display.c
+++ b/kernel/arch/arm/mach-omap2/display.c
@@ -287,6 +287,8 @@ static enum omapdss_version __init omap_display_get_version(void)
                return OMAPDSS_VER_OMAP5;
        else if (soc_is_am43xx())
                return OMAPDSS_VER_AM43xx;
+       else if (soc_is_dra7xx())
+               return OMAPDSS_VER_DRA7xx;
        else
                return OMAPDSS_VER_UNKNOWN;
 }
@@ -568,25 +570,25 @@ void __init omapdss_early_init_of(void)
 
 }
 
+static const char * const omapdss_compat_names[] __initconst = {
+       "ti,omap2-dss",
+       "ti,omap3-dss",
+       "ti,omap4-dss",
+       "ti,omap5-dss",
+       "ti,dra7-dss",
+};
+
 struct device_node * __init omapdss_find_dss_of_node(void)
 {
        struct device_node *node;
+       int i;
 
-       node = of_find_compatible_node(NULL, NULL, "ti,omap2-dss");
-       if (node)
-               return node;
-
-       node = of_find_compatible_node(NULL, NULL, "ti,omap3-dss");
-       if (node)
-               return node;
-
-       node = of_find_compatible_node(NULL, NULL, "ti,omap4-dss");
-       if (node)
-               return node;
-
-       node = of_find_compatible_node(NULL, NULL, "ti,omap5-dss");
-       if (node)
-               return node;
+       for (i = 0; i < ARRAY_SIZE(omapdss_compat_names); ++i) {
+               node = of_find_compatible_node(NULL, NULL,
+                       omapdss_compat_names[i]);
+               if (node)
+                       return node;
+       }
 
        return NULL;
 }