Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: twl6040: Enable automatic power for phoenix 1.1

Browse source 
Phoenix 1.1 supports automatic power on sequence, a
verification is added to use it with new revision of
the chip.

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>
This commit is contained in:
Olaya, Margarita 2010-12-10 21:06:07 -06:00 committed by Liam Girdwood
parent cb973d78f8
commit 99903ea236
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sound/soc/codecs/twl6040.c
View file

@ -1108,6 +1108,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
struct twl6040_data *priv; struct twl6040_data *priv;
int audpwron, naudint; int audpwron, naudint;
int ret = 0; int ret = 0;
u8 icrev;
priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL); priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
@ -1116,13 +1117,17 @@ static int twl6040_probe(struct snd_soc_codec *codec)
priv->codec = codec; priv->codec = codec;
if (twl_codec) { twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &icrev, TWL6040_REG_ASICREV);
if (twl_codec && (icrev > 0))
audpwron = twl_codec->audpwron_gpio; audpwron = twl_codec->audpwron_gpio;
naudint = twl_codec->naudint_irq; else
} else {
audpwron = -EINVAL; audpwron = -EINVAL;
if (twl_codec)
naudint = twl_codec->naudint_irq;
else
naudint = 0; naudint = 0;
}
priv->audpwron = audpwron; priv->audpwron = audpwron;
priv->naudint = naudint; priv->naudint = naudint;