summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-rx51-video.c
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2014-04-08 22:35:50 +0200
committerSebastian Reichel <sre@kernel.org>2014-04-26 01:49:04 +0200
commit56369ec21dc8e77c36a8146a2c80b27b3133d78a (patch)
tree82bfa6e848f96b5e369012e14c29f7da43e2f8f4 /arch/arm/mach-omap2/board-rx51-video.c
parent3217eb6f596887c6099e2ce5169ca724b4549fdf (diff)
downloadlinux-56369ec21dc8e77c36a8146a2c80b27b3133d78a.tar.bz2
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-video.c')
-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)) {