Commit 37b47656 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Liam Girdwood

ASoC: Fix tlv320aic3x GPIO initialization

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: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 3fabe089
...@@ -1231,6 +1231,8 @@ static int aic3x_probe(struct snd_soc_codec *codec) ...@@ -1231,6 +1231,8 @@ static int aic3x_probe(struct snd_soc_codec *codec)
codec->hw_write = (hw_write_t) i2c_master_send; codec->hw_write = (hw_write_t) i2c_master_send;
codec->control_data = aic3x->control_data; codec->control_data = aic3x->control_data;
aic3x_init(codec);
if (aic3x->setup) { if (aic3x->setup) {
/* setup GPIO functions */ /* setup GPIO functions */
aic3x_write(codec, AIC3X_GPIO1_REG, aic3x_write(codec, AIC3X_GPIO1_REG,
...@@ -1239,8 +1241,6 @@ static int aic3x_probe(struct snd_soc_codec *codec) ...@@ -1239,8 +1241,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
(aic3x->setup->gpio_func[1] & 0xf) << 4); (aic3x->setup->gpio_func[1] & 0xf) << 4);
} }
aic3x_init(codec);
snd_soc_add_controls(codec, aic3x_snd_controls, snd_soc_add_controls(codec, aic3x_snd_controls,
ARRAY_SIZE(aic3x_snd_controls)); ARRAY_SIZE(aic3x_snd_controls));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment