diff options
author | Mark A. Greer <mgreer@animalcreek.com> | 2013-03-18 12:06:33 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-03-30 17:51:12 -0400 |
commit | 114d7a8b313bd8540b116c2447887f34d5911362 (patch) | |
tree | 9993e2d8b30cc86ae88cbcce965c86160c731880 /arch/arm/mach-omap2 | |
parent | 8c7bb5739ef4944278f728211291fdaaf22cd25f (diff) |
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')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 |
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) | |||
712 | omap_init_dmic(); | 712 | omap_init_dmic(); |
713 | omap_init_mcpdm(); | 713 | omap_init_mcpdm(); |
714 | omap_init_mcspi(); | 714 | omap_init_mcspi(); |
715 | omap_init_sham(); | ||
715 | } | 716 | } |
716 | omap_init_sti(); | 717 | omap_init_sti(); |
717 | omap_init_rng(); | 718 | omap_init_rng(); |
718 | omap_init_sham(); | ||
719 | omap_init_aes(); | 719 | omap_init_aes(); |
720 | omap_init_vout(); | 720 | omap_init_vout(); |
721 | omap_init_ocp2scp(); | 721 | omap_init_ocp2scp(); |