aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-05-05 20:31:29 -0300
committerRicardo Salveti de Araujo <ricardo.salveti@canonical.com>2011-05-16 22:46:57 -0300
commit570cbf4ad895b7d39b97631a348d98b6c5de94ec (patch)
tree258f93a4155818d9497043c931a3ab9b6fa65e0e
parentaf3ac2ca9b3457a23968caa0b4a282ed62dcf82c (diff)
OMAP: devices: register first the drm omap device, and then the SGX one
Avoid failing to load omap drm module in cases there the hardware doesn't have SGX hwmode description available. Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
-rw-r--r--arch/arm/mach-omap2/devices.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 41bac915b67..7a894475473 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -773,6 +773,9 @@ static void omap_init_gpu(void)
struct gpu_platform_data *pdata;
char *name = "pvrsrvkm";
+ /* Register drm omap device and then look for SGX */
+ platform_device_register(&omap_gpu_device);
+
l = snprintf(oh_name, max_omap_gpu_hwmod_name_len,
"gpu");
WARN(l >= max_omap_gpu_hwmod_name_len,
@@ -804,7 +807,6 @@ static void omap_init_gpu(void)
kfree(pdata);
platform_device_register(&omap_omaplfb_device);
- platform_device_register(&omap_gpu_device);
}
/*-------------------------------------------------------------------------*/