UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Ujfalusi 2010-06-03 07:39:34 +03:00 committed by Liam Girdwood
parent 451fd82dc1
commit f10b8ad15f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/plat-omap/mcbsp.c
View File

@ -576,8 +576,6 @@ u16 omap_mcbsp_get_fifo_size(unsigned int id)
} }
EXPORT_SYMBOL(omap_mcbsp_get_fifo_size); 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 * 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); buffstat = MCBSP_READ(mcbsp, XBUFFSTAT);
/* Number of slots are different in McBSP ports */ /* Number of slots are different in McBSP ports */
if (mcbsp->id == 2) return mcbsp->pdata->buffer_size - buffstat;
return MCBSP2_FIFO_SIZE - buffstat;
else
return MCBSP1345_FIFO_SIZE - buffstat;
} }
EXPORT_SYMBOL(omap_mcbsp_get_tx_delay); EXPORT_SYMBOL(omap_mcbsp_get_tx_delay);