summaryrefslogtreecommitdiffstats
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-09-17 06:48:32 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-19 17:10:56 +0200
commitb9fde18c0582583cf12a4b1c02f621d3addd0a97 (patch)
tree87ea07285c93b62ddc7206b0b7e448f058b42c28 /sound/soc/sh
parentASoC: fsi: modify noisy comment out (diff)
downloadlinux-b9fde18c0582583cf12a4b1c02f621d3addd0a97.tar.xz
linux-b9fde18c0582583cf12a4b1c02f621d3addd0a97.zip
ASoC: fsi: Add fsi_dma_soft_push/pop function
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r--sound/soc/sh/fsi.c72
1 files changed, 54 insertions, 18 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 07a0350f771e..363b37a603cb 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -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
*/
@@ -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 ||
@@ -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;
@@ -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 ||
@@ -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;