diff options
| author | Peter Ujfalusi | 2010-06-03 06:39:34 +0200 |
|---|---|---|
| committer | Liam Girdwood | 2010-06-03 17:12:40 +0200 |
| commit | f10b8ad15f9531b6d58edabccf05e9eb738c4409 (patch) | |
| tree | 537e517c064b92edde9670e0abd05c34adbfe373 /arch | |
| parent | OMAP3: McBSP: Change the way how the FIFO is handled (diff) | |
| download | kernel-qcow2-linux-f10b8ad15f9531b6d58edabccf05e9eb738c4409.tar.gz kernel-qcow2-linux-f10b8ad15f9531b6d58edabccf05e9eb738c4409.tar.xz kernel-qcow2-linux-f10b8ad15f9531b6d58edabccf05e9eb738c4409.zip | |
OMAP3: McBSP: Use the port's buffer_size when calculating tx delay
Sicne the platform data's buffer_size now holds the full size
of the FIFO, there is no longer need to handle the ports
differently.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolsfonmicro.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'arch')
| -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) } EXPORT_SYMBOL(omap_mcbsp_get_fifo_size); -#define MCBSP2_FIFO_SIZE 0x500 /* 1024 + 256 locations */ -#define MCBSP1345_FIFO_SIZE 0x80 /* 128 locations */ /* * omap_mcbsp_get_tx_delay returns the number of used slots in the McBSP FIFO */ @@ -596,10 +594,7 @@ u16 omap_mcbsp_get_tx_delay(unsigned int id) buffstat = MCBSP_READ(mcbsp, XBUFFSTAT); /* Number of slots are different in McBSP ports */ - if (mcbsp->id == 2) - return MCBSP2_FIFO_SIZE - buffstat; - else - return MCBSP1345_FIFO_SIZE - buffstat; + return mcbsp->pdata->buffer_size - buffstat; } EXPORT_SYMBOL(omap_mcbsp_get_tx_delay); |