aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-03-04 15:16:57 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-03-06 08:37:12 -0500
commit20a41eac4fbaa22d051d0fbaeaf3315d2d8c4860 (patch)
tree47dbc8522985fd6625ce4de4f76707feca6d4f75 /sound/soc/pxa
parent89492be88616aa20b3a6c3eb512f83c0c7d0c8a3 (diff)
ASoC: Fix name of register bit in pxa-ssp
A bit in PXA's SSCR0 register was erroneously named ADC but its name is in fact ACS (audio clock select). Signed-off-by: Daniel Mack <daniel@caiaq.de> 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 c49bb12b0a65..7fc13f03d1d2 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -300,7 +300,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
300 int val; 300 int val;
301 301
302 u32 sscr0 = ssp_read_reg(ssp, SSCR0) & 302 u32 sscr0 = ssp_read_reg(ssp, SSCR0) &
303 ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ADC); 303 ~(SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);
304 304
305 dev_dbg(&ssp->pdev->dev, 305 dev_dbg(&ssp->pdev->dev,
306 "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %d\n", 306 "pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %d\n",
@@ -328,7 +328,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
328 case PXA_SSP_CLK_AUDIO: 328 case PXA_SSP_CLK_AUDIO:
329 priv->sysclk = 0; 329 priv->sysclk = 0;
330 ssp_set_scr(&priv->dev, 1); 330 ssp_set_scr(&priv->dev, 1);
331 sscr0 |= SSCR0_ADC; 331 sscr0 |= SSCR0_ACS;
332 break; 332 break;
333 default: 333 default:
334 return -ENODEV; 334 return -ENODEV;
@@ -524,7 +524,7 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
524 524
525 /* reset port settings */ 525 /* reset port settings */
526 sscr0 = ssp_read_reg(ssp, SSCR0) & 526 sscr0 = ssp_read_reg(ssp, SSCR0) &
527 (SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ADC); 527 (SSCR0_ECS | SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);
528 sscr1 = SSCR1_RxTresh(8) | SSCR1_TxTresh(7); 528 sscr1 = SSCR1_RxTresh(8) | SSCR1_TxTresh(7);
529 sspsp = 0; 529 sspsp = 0;
530 530