From 674ee08f28f32032c40c6a9d5376edf4158bfbbc Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Mon, 5 Aug 2013 20:17:22 +0530 Subject: 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 Signed-off-by: Lokesh Vutla Signed-off-by: Herbert Xu --- arch/arm/mach-omap2/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/devices.c') 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; -- cgit v1.2.3