]> Pileus Git - ~andy/linux/commitdiff
ARM: OMAP2+: Only manually add hwmod data when DT not used.
authorMark A. Greer <mgreer@animalcreek.com>
Mon, 18 Mar 2013 16:06:33 +0000 (10:06 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sat, 30 Mar 2013 21:51:12 +0000 (15:51 -0600)
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>
arch/arm/mach-omap2/devices.c

index 9abfcc011b65eb5c4802d9314d54a8790ea207f5..6ff9907e3b547affcfb7af4a5b5fbcfdd0ab5c51 100644 (file)
@@ -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();