* [PATCH] ASoC: multi-component - Fix tlv320aic3x GPIO initialization
@ 2010-08-06 7:04 Jarkko Nikula
2010-08-06 12:14 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Jarkko Nikula @ 2010-08-06 7:04 UTC (permalink / raw)
To: alsa-devel; +Cc: Mark Brown, Liam Girdwood
aic3x_init does a soft reset first and thus TLV320AIC3x GPIO setup must be
done after doing the basic init. Before multi-component the init was done
at i2c probe time and GPIO setup at soc probe time.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
Liam, squash into TI CODECs commit.
---
sound/soc/codecs/tlv320aic3x.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 43fd9c1..0b80e24 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1231,6 +1231,8 @@ static int aic3x_probe(struct snd_soc_codec *codec)
codec->hw_write = (hw_write_t) i2c_master_send;
codec->control_data = aic3x->control_data;
+ aic3x_init(codec);
+
if (aic3x->setup) {
/* setup GPIO functions */
aic3x_write(codec, AIC3X_GPIO1_REG,
@@ -1239,8 +1241,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
(aic3x->setup->gpio_func[1] & 0xf) << 4);
}
- aic3x_init(codec);
-
snd_soc_add_controls(codec, aic3x_snd_controls,
ARRAY_SIZE(aic3x_snd_controls));
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: multi-component - Fix tlv320aic3x GPIO initialization
2010-08-06 7:04 [PATCH] ASoC: multi-component - Fix tlv320aic3x GPIO initialization Jarkko Nikula
@ 2010-08-06 12:14 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2010-08-06 12:14 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: alsa-devel, Liam Girdwood
On Fri, Aug 06, 2010 at 10:04:38AM +0300, Jarkko Nikula wrote:
> aic3x_init does a soft reset first and thus TLV320AIC3x GPIO setup must be
> done after doing the basic init. Before multi-component the init was done
> at i2c probe time and GPIO setup at soc probe time.
>
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-06 12:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-06 7:04 [PATCH] ASoC: multi-component - Fix tlv320aic3x GPIO initialization Jarkko Nikula
2010-08-06 12:14 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.