Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / devices.c

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 0cc54dd553e36fa7c56d9a56b46adba881fdc2f8..726c02c9c0cdcfd87ac88a4ec0584712ab58bc69 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -357,6 +357,33 @@ static inline void omap_init_uwire(void) {}
 #endif
 
 
+#define OMAP1_RNG_BASE         0xfffe5000
+
+static struct resource omap1_rng_resources[] = {
+       {
+               .start          = OMAP1_RNG_BASE,
+               .end            = OMAP1_RNG_BASE + 0x4f,
+               .flags          = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device omap1_rng_device = {
+       .name           = "omap_rng",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(omap1_rng_resources),
+       .resource       = omap1_rng_resources,
+};
+
+static void omap1_init_rng(void)
+{
+       if (!cpu_is_omap16xx())
+               return;
+
+       (void) platform_device_register(&omap1_rng_device);
+}
+
+/*-------------------------------------------------------------------------*/
+
 /*
  * This gets called after board-specific INIT_MACHINE, and initializes most
  * on-chip peripherals accessible on this board (except for few like USB):
@@ -395,6 +422,7 @@ static int __init omap1_init_devices(void)
        omap_init_spi100k();
        omap_init_sti();
        omap_init_uwire();
+       omap1_init_rng();
 
        return 0;
 }