summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2012-12-21 17:28:12 +0100
committerPaul Walmsley <paul@pwsan.com>2013-03-30 22:52:05 +0100
commit53335acc444fdb8cf3479e4c45a3165281a592dd (patch)
treee6d0989d2b7e2033b0b7117f105aa43efe002d5b
parentARM: OMAP2+: Remove unnecessary message when no AES IP is present (diff)
downloadlinux-53335acc444fdb8cf3479e4c45a3165281a592dd.tar.xz
linux-53335acc444fdb8cf3479e4c45a3165281a592dd.zip
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>
-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 ef4ac5385b41..4269fc145698 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();