summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/display.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2013-09-16 11:18:29 +0400
committerTony Lindgren <tony@atomide.com>2013-10-09 01:02:35 +0400
commit7a59743d0ccbeade0cb130f9ceabbe51cb6d3eb7 (patch)
tree96c139fe65c3be5893250790b9f6335dda3b8db9 /arch/arm/mach-omap2/display.c
parent7dfebabd4852b08ec0093d6f78aba7bc1b100318 (diff)
downloadlinux-7a59743d0ccbeade0cb130f9ceabbe51cb6d3eb7.tar.xz
ARM: OMAP2+: display: Create omapdrm device inside omap_display_init
Move omapdrm device creation inside the omap_display_init so that we can correctly create the device based on the presence of omapdss within the platform. For example, on a kernel image supporting multiple platforms, omap_init_drm will create a omapdrm platform device on a AM33xx platform even though it doesn't have a DSS block. Originally worked on by Andy Gross. Cc: Andy Gross <andygro@gmail.com> Signed-off-by: Archit Taneja <archit@ti.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/display.c')
-rw-r--r--arch/arm/mach-omap2/display.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 03a0516c7f67..8d8ee4742f3f 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -416,6 +416,13 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
}
}
+ /* create DRM device */
+ r = omap_init_drm();
+ if (r < 0) {
+ pr_err("Unable to register omapdrm device\n");
+ return r;
+ }
+
return 0;
}