diff options
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 4ef46047b787..e31496e35b0f 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -576,8 +576,6 @@ u16 omap_mcbsp_get_fifo_size(unsigned int id) | |||
576 | } | 576 | } |
577 | EXPORT_SYMBOL(omap_mcbsp_get_fifo_size); | 577 | EXPORT_SYMBOL(omap_mcbsp_get_fifo_size); |
578 | 578 | ||
579 | #define MCBSP2_FIFO_SIZE 0x500 /* 1024 + 256 locations */ | ||
580 | #define MCBSP1345_FIFO_SIZE 0x80 /* 128 locations */ | ||
581 | /* | 579 | /* |
582 | * omap_mcbsp_get_tx_delay returns the number of used slots in the McBSP FIFO | 580 | * omap_mcbsp_get_tx_delay returns the number of used slots in the McBSP FIFO |
583 | */ | 581 | */ |
@@ -596,10 +594,7 @@ u16 omap_mcbsp_get_tx_delay(unsigned int id) | |||
596 | buffstat = MCBSP_READ(mcbsp, XBUFFSTAT); | 594 | buffstat = MCBSP_READ(mcbsp, XBUFFSTAT); |
597 | 595 | ||
598 | /* Number of slots are different in McBSP ports */ | 596 | /* Number of slots are different in McBSP ports */ |
599 | if (mcbsp->id == 2) | 597 | return mcbsp->pdata->buffer_size - buffstat; |
600 | return MCBSP2_FIFO_SIZE - buffstat; | ||
601 | else | ||
602 | return MCBSP1345_FIFO_SIZE - buffstat; | ||
603 | } | 598 | } |
604 | EXPORT_SYMBOL(omap_mcbsp_get_tx_delay); | 599 | EXPORT_SYMBOL(omap_mcbsp_get_tx_delay); |
605 | 600 | ||