summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2013-08-05 20:17:22 +0530
committerHerbert Xu <herbert@gondor.apana.org.au>2013-08-09 16:39:48 +1000
commit674ee08f28f32032c40c6a9d5376edf4158bfbbc (patch)
tree4381a2e2d059e2e203e7f670ee6af5ccd383b9ca /arch
parentc903970ceaaaddb665d356d078372f0985d5948e (diff)
downloadlinux-stable-674ee08f28f32032c40c6a9d5376edf4158bfbbc.tar.gz
linux-stable-674ee08f28f32032c40c6a9d5376edf4158bfbbc.tar.bz2
linux-stable-674ee08f28f32032c40c6a9d5376edf4158bfbbc.zip
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')
-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)
omap_init_mcspi();
omap_init_sham();
omap_init_aes();
+ omap_init_rng();
} else {
/* These can be removed when bindings are done */
omap_init_wl12xx_of();
}
omap_init_sti();
- omap_init_rng();
omap_init_vout();
return 0;