From: Lokesh Vutla <lokeshvutla@ti.com>
Date: Mon, 5 Aug 2013 14:47:22 +0000 (+0530)
Subject: ARM: OMAP2+: Only manually add hwmod data when DT not used.
X-Git-Tag: v3.12-rc1~108^2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=674ee08f28f32032c40c6a9d5376edf4158bfbbc;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index aef96e45cb204..ba8d06598e55b 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;