summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/devices.c
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2013-03-18 17:06:33 +0100
committerPaul Walmsley <paul@pwsan.com>2013-03-30 22:51:12 +0100
commit114d7a8b313bd8540b116c2447887f34d5911362 (patch)
tree9993e2d8b30cc86ae88cbcce965c86160c731880 /arch/arm/mach-omap2/devices.c
parentARM: OMAP2+: Remove unnecessary message when no SHA IP is present (diff)
downloadlinux-114d7a8b313bd8540b116c2447887f34d5911362.tar.xz
linux-114d7a8b313bd8540b116c2447887f34d5911362.zip
ARM: OMAP2+: Only manually add hwmod data when DT not used.
The omap_init_sham() 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>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-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 9abfcc011b65..6ff9907e3b54 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -712,10 +712,10 @@ static int __init omap2_init_devices(void)
omap_init_dmic();
omap_init_mcpdm();
omap_init_mcspi();
+ omap_init_sham();
}
omap_init_sti();
omap_init_rng();
- omap_init_sham();
omap_init_aes();
omap_init_vout();
omap_init_ocp2scp();