aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-04-23 05:57:46 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-23 06:00:58 -0400
commit8eb9feabe566d8272510d5fb33f55a72e3ab3ce4 (patch)
tree73d9d2a92ea1bb3887fdcfe7522d1153ad9e2a10 /sound/soc/pxa
parent049da6393fb30b62e418beb59a74dfcad513fc6d (diff)
ASoC: change stereo/mono to 32-bit/16-bit for pxa-ssp
The original idea came from pHilipp, and this makes the code looks more consistent. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/pxa-ssp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index fb8cacca3416..6fc787610ad7 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -67,7 +67,7 @@ struct pxa2xx_pcm_dma_data {
67}; 67};
68 68
69static struct pxa2xx_pcm_dma_params * 69static struct pxa2xx_pcm_dma_params *
70ssp_get_dma_params(struct ssp_device *ssp, int stereo, int out) 70ssp_get_dma_params(struct ssp_device *ssp, int width4, int out)
71{ 71{
72 struct pxa2xx_pcm_dma_data *dma; 72 struct pxa2xx_pcm_dma_data *dma;
73 73
@@ -76,13 +76,13 @@ ssp_get_dma_params(struct ssp_device *ssp, int stereo, int out)
76 return NULL; 76 return NULL;
77 77
78 snprintf(dma->name, 20, "SSP%d PCM %s %s", ssp->port_id, 78 snprintf(dma->name, 20, "SSP%d PCM %s %s", ssp->port_id,
79 stereo ? "Stereo" : "Mono", out ? "out" : "in"); 79 width4 ? "32-bit" : "16-bit", out ? "out" : "in");
80 80
81 dma->params.name = dma->name; 81 dma->params.name = dma->name;
82 dma->params.drcmr = &DRCMR(out ? ssp->drcmr_tx : ssp->drcmr_rx); 82 dma->params.drcmr = &DRCMR(out ? ssp->drcmr_tx : ssp->drcmr_rx);
83 dma->params.dcmd = (out ? (DCMD_INCSRCADDR | DCMD_FLOWTRG) : 83 dma->params.dcmd = (out ? (DCMD_INCSRCADDR | DCMD_FLOWTRG) :
84 (DCMD_INCTRGADDR | DCMD_FLOWSRC)) | 84 (DCMD_INCTRGADDR | DCMD_FLOWSRC)) |
85 (stereo ? DCMD_WIDTH4 : DCMD_WIDTH2) | DCMD_BURST16; 85 (width4 ? DCMD_WIDTH4 : DCMD_WIDTH2) | DCMD_BURST16;
86 dma->params.dev_addr = ssp->phys_base + SSDR; 86 dma->params.dev_addr = ssp->phys_base + SSDR;
87 87
88 return &dma->params; 88 return &dma->params;