Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 752b7764 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: tlv320aic32x4: Move GPIO acquisition to I2C probe 



This is more idiomatic and interacts better with deferred probe.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 4a10c2ac

sound/soc/codecs/tlv320aic32x4.c

+7 −5
Original line number Diff line number Diff line
@@ -617,16 +617,11 @@ static int aic32x4_probe(struct snd_soc_codec *codec) 
{

	struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec);

	u32 tmp_reg;

	int ret;



	codec->hw_write = (hw_write_t) i2c_master_send;

	codec->control_data = aic32x4->control_data;



	if (aic32x4->rstn_gpio >= 0) {

		ret = devm_gpio_request_one(codec->dev, aic32x4->rstn_gpio,

				GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn");

		if (ret != 0)

			return ret;

		ndelay(10);

		gpio_set_value(aic32x4->rstn_gpio, 1);

	}
@@ -735,6 +730,13 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c, 
		aic32x4->rstn_gpio = -1;

	}



	if (aic32x4->rstn_gpio >= 0) {

		ret = devm_gpio_request_one(&i2c->dev, aic32x4->rstn_gpio,

				GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn");

		if (ret != 0)

			return ret;

	}



	ret = snd_soc_register_codec(&i2c->dev,

			&soc_codec_dev_aic32x4, &aic32x4_dai, 1);

	return ret;