aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2013-08-05 10:47:22 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2013-08-09 02:39:48 -0400
commit674ee08f28f32032c40c6a9d5376edf4158bfbbc (patch)
tree4381a2e2d059e2e203e7f670ee6af5ccd383b9ca /arch/arm/mach-omap2
parentc903970ceaaaddb665d356d078372f0985d5948e (diff)
ARM: OMAP2+: Only manually add hwmod data when DT not used.
The omap_init_rng() routine in devices.c only needs to be called when there is no device tree present. Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/devices.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index aef96e45cb20..ba8d06598e55 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -571,12 +571,12 @@ static int __init omap2_init_devices(void)
571 omap_init_mcspi(); 571 omap_init_mcspi();
572 omap_init_sham(); 572 omap_init_sham();
573 omap_init_aes(); 573 omap_init_aes();
574 omap_init_rng();
574 } else { 575 } else {
575 /* These can be removed when bindings are done */ 576 /* These can be removed when bindings are done */
576 omap_init_wl12xx_of(); 577 omap_init_wl12xx_of();
577 } 578 }
578 omap_init_sti(); 579 omap_init_sti();
579 omap_init_rng();
580 omap_init_vout(); 580 omap_init_vout();
581 581
582 return 0; 582 return 0;