OSDN Git Service

ARM: OMAP2+: N900: remove omapdss init for DT boot
authorSebastian Reichel <sre@kernel.org>
Tue, 8 Apr 2014 20:51:18 +0000 (22:51 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 18 Apr 2014 23:37:43 +0000 (16:37 -0700)
Do not try to initialize display for DT boot, since omapdss
is now initialized via Device Tree. Without this patch the
display subsystem does not properly come up.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-rx51-video.c

index 43a90c8..9cfebc5 100644 (file)
@@ -48,7 +48,7 @@ static struct omap_dss_board_info rx51_dss_board_info = {
 
 static int __init rx51_video_init(void)
 {
-       if (!machine_is_nokia_rx51() && !of_machine_is_compatible("nokia,omap3-n900"))
+       if (!machine_is_nokia_rx51())
                return 0;
 
        if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {