Commit f10b8ad1 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Liam Girdwood

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: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolsfonmicro.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 451fd82d
...@@ -576,8 +576,6 @@ u16 omap_mcbsp_get_fifo_size(unsigned int id) ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment