diff options
| author | Ben Dooks <ben@simtec.co.uk> | 2009-02-26 21:56:21 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-02-26 21:56:21 +0000 |
| commit | e049602ca1658d89956cb2a0f7b73f5e0887f929 (patch) | |
| tree | 37459caf448eb9c79be8625ff0b34be12af6235d /sound/soc | |
| parent | 26ab280dbe65fc7decae4ab31bca9ee7162d3c98 (diff) | |
AUDIO: Fixup s3c-i2s-v2 merge problems
Fix CONFIG_CPU_S3C64XX which should have been CONFIG_PLAT_S3C64XX.
Fix the merge problems that failed to properly set the master/slave
bits for S3C64XX.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 8a57f77d9a2..43262e1e8f9 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -263,7 +263,7 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai, #define IISMOD_MASTER S3C2412_IISMOD_MASTER_INTERNAL #endif -#if defined(CONFIG_CPU_S3C64XX) +#if defined(CONFIG_PLAT_S3C64XX) /* From Rev1.1 datasheet, we have two master and two slave modes: * IMS[11:10]: * 00 = master mode, fed from PCLK @@ -279,13 +279,13 @@ static int s3c2412_i2s_set_fmt(struct snd_soc_dai *cpu_dai, switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: i2s->master = 0; - iismod &= ~S3C2412_IISMOD_MASTER_MASK; - iismod |= S3C2412_IISMOD_SLAVE; + iismod &= ~IISMOD_MASTER_MASK; + iismod |= IISMOD_SLAVE; break; case SND_SOC_DAIFMT_CBS_CFS: i2s->master = 1; - iismod &= ~S3C2412_IISMOD_MASTER_MASK; - iismod |= S3C2412_IISMOD_MASTER_INTERNAL; + iismod &= ~IISMOD_MASTER_MASK; + iismod |= IISMOD_MASTER; break; default: DBG("unknwon master/slave format\n"); |