]> Pileus Git - ~andy/linux/commitdiff
OMAP: board-generic: enable DSS for panda & sdp boards
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 5 Nov 2012 13:14:19 +0000 (15:14 +0200)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Nov 2012 21:33:49 +0000 (13:33 -0800)
Call the non-DT omapdss setup code from board-generic if the board is
omap4-panda or omap4-sdp. This will give us working omapdss for those
boards when using DT kernel.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-generic.c

index 601ecdfb1cf9b88217caf49a3d8a9eedc34e6411..8f5f21c94e7c28804d5bf92ce7bafabf0e7c3f73 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