summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2014-04-08 22:51:18 +0200
committerTony Lindgren <tony@atomide.com>2014-04-19 01:37:43 +0200
commit3348e28ddc0eb9749365d6e7ff9f1828667622e3 (patch)
tree59d43b5e66dff8a97da383522b9ef992a2bcfe4a /arch
parentARM: dts: dra7xx-clocks: Correct mcasp2_ahclkx_mux bit-shift (diff)
downloadlinux-3348e28ddc0eb9749365d6e7ff9f1828667622e3.tar.xz
linux-3348e28ddc0eb9749365d6e7ff9f1828667622e3.zip
ARM: OMAP2+: N900: remove omapdss init for DT boot
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/board-rx51-video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 43a90c8d6837..9cfebc5c7455 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -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)) {