aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorOlaya, Margarita <magi.olaya@ti.com>2010-12-10 22:05:24 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-12-14 15:36:37 -0500
commit0dec1ec72317caa64f0174f8190c714ae4d51040 (patch)
treeebf00df7f09943966c408948faeb5a2504eca8c8 /sound/soc
parent96dc227c9086bc84ca23af70741b2a76e3dd08eb (diff)
ASoC: twl6040: Update twl IO macro
Update the codec to use the new twl core register macros Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/twl6040.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 5d7e2f7b194c..d33d2b4769f3 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -210,7 +210,7 @@ static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
210 if (reg >= TWL6040_CACHEREGNUM) 210 if (reg >= TWL6040_CACHEREGNUM)
211 return -EIO; 211 return -EIO;
212 212
213 twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &value, reg); 213 twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &value, reg);
214 twl6040_write_reg_cache(codec, reg, value); 214 twl6040_write_reg_cache(codec, reg, value);
215 215
216 return value; 216 return value;
@@ -226,7 +226,7 @@ static int twl6040_write(struct snd_soc_codec *codec,
226 return -EIO; 226 return -EIO;
227 227
228 twl6040_write_reg_cache(codec, reg, value); 228 twl6040_write_reg_cache(codec, reg, value);
229 return twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg); 229 return twl_i2c_write_u8(TWL_MODULE_AUDIO_VOICE, value, reg);
230} 230}
231 231
232static void twl6040_init_vio_regs(struct snd_soc_codec *codec) 232static void twl6040_init_vio_regs(struct snd_soc_codec *codec)
@@ -439,7 +439,7 @@ static irqreturn_t twl6040_naudint_handler(int irq, void *data)
439 struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); 439 struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
440 u8 intid; 440 u8 intid;
441 441
442 twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &intid, TWL6040_REG_INTID); 442 twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid, TWL6040_REG_INTID);
443 443
444 switch (intid) { 444 switch (intid) {
445 case TWL6040_THINT: 445 case TWL6040_THINT:
@@ -715,7 +715,7 @@ static int twl6040_power_up_completion(struct snd_soc_codec *codec,
715 msecs_to_jiffies(48)); 715 msecs_to_jiffies(48));
716 716
717 if (!time_left) { 717 if (!time_left) {
718 twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &intid, 718 twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid,
719 TWL6040_REG_INTID); 719 TWL6040_REG_INTID);
720 if (!(intid & TWL6040_READYINT)) { 720 if (!(intid & TWL6040_READYINT)) {
721 dev_err(codec->dev, "timeout waiting for READYINT\n"); 721 dev_err(codec->dev, "timeout waiting for READYINT\n");