]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commitdiff
TI-Integration: ARM: OMAP2+: Fix merege by restoring omap_mcasp_init() call ti2013.04.02
authorJyri Sarha <jsarha@ti.com>
Tue, 14 May 2013 22:31:34 +0000 (22:31 +0000)
committerDan Murphy <dmurphy@ti.com>
Fri, 7 Jun 2013 12:37:05 +0000 (07:37 -0500)
Restore omap_mcasp_init() call that was lost in 1b891dcc-merge. McASP
device needs to be present for ABE TWL6040 probe to complete.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
arch/arm/mach-omap2/devices.c

index 20ccfff7ecc5354f088c4f3492a2caa40d660b7f..2d4f9c02dccf29cae8b5e322f046fed2ca252cb4 100644 (file)
@@ -690,6 +690,7 @@ static int __init omap2_init_devices(void)
                omap_init_dmic();
                omap_init_mcpdm();
                omap_init_mcspi();
+               omap_init_mcasp();
                omap_init_sham();
                omap_init_aes();
        }