From: Mark A. Greer <mgreer@animalcreek.com>
Date: Fri, 21 Dec 2012 16:28:12 +0000 (-0700)
Subject: ARM: OMAP2+: Only manually add hwmod data when DT not used.
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=53335acc444fdb8cf3479e4c45a3165281a592dd;p=~shefty%2Frdma-dev.git

ARM: OMAP2+: Only manually add hwmod data when DT not used.

The omap_init_aes() routine in devices.c only needs to be
called when there is no device tree present.

CC: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
---

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index ef4ac5385b4..4269fc14569 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -656,10 +656,10 @@ static int __init omap2_init_devices(void)
 		omap_init_mcpdm();
 		omap_init_mcspi();
 		omap_init_sham();
+		omap_init_aes();
 	}
 	omap_init_sti();
 	omap_init_rng();
-	omap_init_aes();
 	omap_init_vout();
 	omap_init_ocp2scp();