aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-04-23 17:57:46 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-23 11:00:58 +0100
commit8eb9feabe566d8272510d5fb33f55a72e3ab3ce4 (patch)
tree73d9d2a92ea1bb3887fdcfe7522d1153ad9e2a10 /sound/soc/pxa
parent049da6393fb30b62e418beb59a74dfcad513fc6d (diff)
downloadkernel_goldelico_gta04-8eb9feabe566d8272510d5fb33f55a72e3ab3ce4.zip
kernel_goldelico_gta04-8eb9feabe566d8272510d5fb33f55a72e3ab3ce4.tar.gz
kernel_goldelico_gta04-8eb9feabe566d8272510d5fb33f55a72e3ab3ce4.tar.bz2
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 fb8cacc..6fc7876 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -67,7 +67,7 @@ struct pxa2xx_pcm_dma_data {
};
static struct pxa2xx_pcm_dma_params *
-ssp_get_dma_params(struct ssp_device *ssp, int stereo, int out)
+ssp_get_dma_params(struct ssp_device *ssp, int width4, int out)
{
struct pxa2xx_pcm_dma_data *dma;
@@ -76,13 +76,13 @@ ssp_get_dma_params(struct ssp_device *ssp, int stereo, int out)
return NULL;
snprintf(dma->name, 20, "SSP%d PCM %s %s", ssp->port_id,
- stereo ? "Stereo" : "Mono", out ? "out" : "in");
+ width4 ? "32-bit" : "16-bit", out ? "out" : "in");
dma->params.name = dma->name;
dma->params.drcmr = &DRCMR(out ? ssp->drcmr_tx : ssp->drcmr_rx);
dma->params.dcmd = (out ? (DCMD_INCSRCADDR | DCMD_FLOWTRG) :
(DCMD_INCTRGADDR | DCMD_FLOWSRC)) |
- (stereo ? DCMD_WIDTH4 : DCMD_WIDTH2) | DCMD_BURST16;
+ (width4 ? DCMD_WIDTH4 : DCMD_WIDTH2) | DCMD_BURST16;
dma->params.dev_addr = ssp->phys_base + SSDR;
return &dma->params;