Merge tag 'for-linus-docs-2012-05-02' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 19bc1c1795f70903ee4465a24950449f751ae169..4269fc1456980458f52aec7c95a5694c82d1dee6 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -519,19 +519,15 @@ static void __init omap_init_sham(void)
 
 static void __init omap_init_aes(void)
 {
-       if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
-               struct omap_hwmod *oh;
-               struct platform_device *pdev;
-
-               oh = omap_hwmod_lookup("aes");
-               if (!oh)
-                       return;
-
-               pdev = omap_device_build("omap-aes", -1, oh, NULL, 0);
-               WARN(IS_ERR(pdev), "Can't build omap_device for omap-aes\n");
-       } else {
-               pr_err("%s: platform not supported\n", __func__);
-       }
+       struct omap_hwmod *oh;
+       struct platform_device *pdev;
+
+       oh = omap_hwmod_lookup("aes");
+       if (!oh)
+               return;
+
+       pdev = omap_device_build("omap-aes", -1, oh, NULL, 0);
+       WARN(IS_ERR(pdev), "Can't build omap_device for omap-aes\n");
 }
 
 /*-------------------------------------------------------------------------*/
@@ -660,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();