Skip to content

Commit

Permalink
ASoC: twl6040: Enable automatic power for phoenix 1.1
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Olaya, Margarita authored and Liam Girdwood committed Dec 14, 2010
1 parent cb973d7 commit 99903ea
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions sound/soc/codecs/twl6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -1108,6 +1108,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
struct twl6040_data *priv;
int audpwron, naudint;
int ret = 0;
u8 icrev;

priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
if (priv == NULL)
Expand All @@ -1116,13 +1117,17 @@ static int twl6040_probe(struct snd_soc_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;
naudint = twl_codec->naudint_irq;
} else {
else
audpwron = -EINVAL;

if (twl_codec)
naudint = twl_codec->naudint_irq;
else
naudint = 0;
}

priv->audpwron = audpwron;
priv->naudint = naudint;
Expand Down

0 comments on commit 99903ea

Please sign in to comment.