Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[karo-tx-linux.git] / arch / arm / mach-omap2 / mcbsp.c

diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 28fcb27005d2912ec13dec5be59d777e721f67a6..fb4bcf81a183311c9a0baf95ed7a92af61ae01ff 100644 (file)
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -156,6 +156,9 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
                else
                        /* The FIFO has 128 locations */
                        pdata->buffer_size = 0x80;
+       } else if (oh->class->rev == MCBSP_CONFIG_TYPE4) {
+               /* The FIFO has 128 locations for all instances */
+               pdata->buffer_size = 0x80;
        }
 
        if (oh->class->rev >= MCBSP_CONFIG_TYPE3)