diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-04-27 02:56:51 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-05 10:13:48 -0400 |
commit | d47ef9c79dd46c1b33696f01b6cf744b77150379 (patch) | |
tree | 6d07d9acabcead11c77d323a42d26307d79273ca | |
parent | 5728242789d3538abcfdcb28e01798801efd9988 (diff) |
ASoC: S3C64XX: I2S: Use s3c2412 defines
Now that the fields are defined for s3c2412, use them and avoid having
multiple copies of same defines.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/s3c24xx/regs-i2s-v2.h | 3 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/regs-i2s-v2.h b/sound/soc/s3c24xx/regs-i2s-v2.h index 484858a5f33b..5e5e5680580b 100644 --- a/sound/soc/s3c24xx/regs-i2s-v2.h +++ b/sound/soc/s3c24xx/regs-i2s-v2.h | |||
@@ -73,9 +73,6 @@ | |||
73 | #define S3C64XX_IISMOD_BLC_24BIT (2 << 13) | 73 | #define S3C64XX_IISMOD_BLC_24BIT (2 << 13) |
74 | #define S3C64XX_IISMOD_BLC_MASK (3 << 13) | 74 | #define S3C64XX_IISMOD_BLC_MASK (3 << 13) |
75 | 75 | ||
76 | #define S3C64XX_IISMOD_IMS_PCLK (0 << 10) | ||
77 | #define S3C64XX_IISMOD_IMS_SYSMUX (1 << 10) | ||
78 | |||
79 | #define S3C2412_IISMOD_IMS_SYSMUX (1 << 10) | 76 | #define S3C2412_IISMOD_IMS_SYSMUX (1 << 10) |
80 | #define S3C2412_IISMOD_SLAVE (1 << 11) | 77 | #define S3C2412_IISMOD_SLAVE (1 << 11) |
81 | #define S3C2412_IISMOD_MODE_TXONLY (0 << 8) | 78 | #define S3C2412_IISMOD_MODE_TXONLY (0 << 8) |
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 97327ef09de6..6d49bd93717b 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c | |||
@@ -62,11 +62,11 @@ static int s3c64xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, | |||
62 | 62 | ||
63 | switch (clk_id) { | 63 | switch (clk_id) { |
64 | case S3C64XX_CLKSRC_PCLK: | 64 | case S3C64XX_CLKSRC_PCLK: |
65 | iismod &= ~S3C64XX_IISMOD_IMS_SYSMUX; | 65 | iismod &= ~S3C2412_IISMOD_IMS_SYSMUX; |
66 | break; | 66 | break; |
67 | 67 | ||
68 | case S3C64XX_CLKSRC_MUX: | 68 | case S3C64XX_CLKSRC_MUX: |
69 | iismod |= S3C64XX_IISMOD_IMS_SYSMUX; | 69 | iismod |= S3C2412_IISMOD_IMS_SYSMUX; |
70 | break; | 70 | break; |
71 | 71 | ||
72 | case S3C64XX_CLKSRC_CDCLK: | 72 | case S3C64XX_CLKSRC_CDCLK: |