Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-3.10.git] / arch / arm / mach-omap2 / board-generic.c
index f0715a3..53cb380 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "common.h"
 #include "common-board-devices.h"
+#include "dss-common.h"
 
 #if !(defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
 #define intc_of_init   NULL
@@ -40,6 +41,15 @@ static void __init omap_generic_init(void)
        omap_sdrc_init(NULL, NULL);
 
        of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
+
+       /*
+        * HACK: call display setup code for selected boards to enable omapdss.
+        * This will be removed when omapdss supports DT.
+        */
+       if (of_machine_is_compatible("ti,omap4-panda"))
+               omap4_panda_display_init_of();
+       else if (of_machine_is_compatible("ti,omap4-sdp"))
+               omap_4430sdp_display_init_of();
 }
 
 #ifdef CONFIG_SOC_OMAP2420