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

Commit 008f8d4f authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Push wm8978 reset down into the I2C probe 



Ensures that we get control of the CODEC earlier and don't try to probe
the card at all if register I/O isn't working.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ee60d015

sound/soc/codecs/wm8978.c

+15 −7
Original line number Original line Diff line number Diff line
@@ -1000,13 +1000,6 @@ static int wm8978_probe(struct snd_soc_codec *codec) 
	for (i = 0; i < ARRAY_SIZE(update_reg); i++)

	for (i = 0; i < ARRAY_SIZE(update_reg); i++)

		snd_soc_update_bits(codec, update_reg[i], 0x100, 0x100);

		snd_soc_update_bits(codec, update_reg[i], 0x100, 0x100);





	/* Reset the codec */

	ret = snd_soc_write(codec, WM8978_RESET, 0);

	if (ret < 0) {

		dev_err(codec->dev, "Failed to issue reset\n");

		return ret;

	}



	wm8978_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	wm8978_set_bias_level(codec, SND_SOC_BIAS_STANDBY);





	return 0;

	return 0;
@@ -1066,9 +1059,24 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, 




	i2c_set_clientdata(i2c, wm8978);

	i2c_set_clientdata(i2c, wm8978);





	/* Reset the codec */

	ret = regmap_write(wm8978->regmap, WM8978_RESET, 0);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to issue reset: %d\n", ret);

		goto err;

	}



	ret = snd_soc_register_codec(&i2c->dev,

	ret = snd_soc_register_codec(&i2c->dev,

			&soc_codec_dev_wm8978, &wm8978_dai, 1);

			&soc_codec_dev_wm8978, &wm8978_dai, 1);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);

		goto err;

	}





	return 0;



err:

	regmap_exit(wm8978->regmap);

	return ret;

	return ret;

}

}