Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / arch / arm / mach-omap2 / drm.c

diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
index 6282cc82661355afe27abdeb114f92ba6895b747..fce5aa3fff49b8cfea304426da3d316e71055273 100644 (file)
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@ -23,15 +23,20 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/platform_data/omap_drm.h>
 
 #include "omap_device.h"
 #include "omap_hwmod.h"
+#include <plat/cpu.h>
 
 #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
 
+static struct omap_drm_platform_data platform_data;
+
 static struct platform_device omap_drm_device = {
        .dev = {
                .coherent_dma_mask = DMA_BIT_MASK(32),
+               .platform_data = &platform_data,
        },
        .name = "omapdrm",
        .id = 0,
@@ -52,6 +57,8 @@ static int __init omap_init_drm(void)
                        oh->name);
        }
 
+       platform_data.omaprev = GET_OMAP_REVISION();
+
        return platform_device_register(&omap_drm_device);
 
 }