Skip to content

Commit

Permalink
ASoC: fsi: Add fsi_dma_soft_push/pop function
Browse files Browse the repository at this point in the history
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Sep 19, 2010
1 parent c8fe257 commit b9fde18
Showing 1 changed file with 54 additions and 18 deletions.
72 changes: 54 additions & 18 deletions sound/soc/sh/fsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,59 @@ static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play)
return residue;
}

/*
* dma function
*/

static u8 *fsi_dma_get_area(struct fsi_priv *fsi)
{
return fsi->substream->runtime->dma_area + fsi->byte_offset;
}

static void fsi_dma_soft_push16(struct fsi_priv *fsi, int size)
{
u16 *start;
int i;

start = (u16 *)fsi_dma_get_area(fsi);

for (i = 0; i < size; i++)
fsi_reg_write(fsi, DODT, ((u32)*(start + i) << 8));
}

static void fsi_dma_soft_pop16(struct fsi_priv *fsi, int size)
{
u16 *start;
int i;

start = (u16 *)fsi_dma_get_area(fsi);

for (i = 0; i < size; i++)
*(start + i) = (u16)(fsi_reg_read(fsi, DIDT) >> 8);
}

static void fsi_dma_soft_push32(struct fsi_priv *fsi, int size)
{
u32 *start;
int i;

start = (u32 *)fsi_dma_get_area(fsi);

for (i = 0; i < size; i++)
fsi_reg_write(fsi, DODT, *(start + i));
}

static void fsi_dma_soft_pop32(struct fsi_priv *fsi, int size)
{
u32 *start;
int i;

start = (u32 *)fsi_dma_get_area(fsi);

for (i = 0; i < size; i++)
*(start + i) = fsi_reg_read(fsi, DIDT);
}

/*
* irq function
*/
Expand Down Expand Up @@ -500,8 +548,7 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
int send;
int fifo_free;
int width;
u8 *start;
int i, over_period;
int over_period;

if (!fsi ||
!fsi->substream ||
Expand Down Expand Up @@ -538,17 +585,12 @@ static int fsi_data_push(struct fsi_priv *fsi, int startup)
if (fifo_free < send)
send = fifo_free;

start = fsi_dma_get_area(fsi);

switch (width) {
case 2:
for (i = 0; i < send; i++)
fsi_reg_write(fsi, DODT,
((u32)*((u16 *)start + i) << 8));
fsi_dma_soft_push16(fsi, send);
break;
case 4:
for (i = 0; i < send; i++)
fsi_reg_write(fsi, DODT, *((u32 *)start + i));
fsi_dma_soft_push32(fsi, send);
break;
default:
return -EINVAL;
Expand Down Expand Up @@ -583,8 +625,7 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
int free;
int fifo_fill;
int width;
u8 *start;
int i, over_period;
int over_period;

if (!fsi ||
!fsi->substream ||
Expand Down Expand Up @@ -620,17 +661,12 @@ static int fsi_data_pop(struct fsi_priv *fsi, int startup)
if (free < fifo_fill)
fifo_fill = free;

start = fsi_dma_get_area(fsi);

switch (width) {
case 2:
for (i = 0; i < fifo_fill; i++)
*((u16 *)start + i) =
(u16)(fsi_reg_read(fsi, DIDT) >> 8);
fsi_dma_soft_pop16(fsi, fifo_fill);
break;
case 4:
for (i = 0; i < fifo_fill; i++)
*((u32 *)start + i) = fsi_reg_read(fsi, DIDT);
fsi_dma_soft_pop32(fsi, fifo_fill);
break;
default:
return -EINVAL;
Expand Down

0 comments on commit b9fde18

Please sign in to comment.