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

Commit 252e91ff authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

ASoC: sgtl5000: read chip revision for once 



Store chip revision in struct sgtl5000_priv when sgtl5000_i2c_probe()
reads it out from register, so that we can use it in
sgtl5000_enable_regulators() with no need to read register again.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1

sound/soc/codecs/sgtl5000.c

+3 −13
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ struct sgtl5000_priv { 
	struct ldo_regulator *ldo;

	struct regmap *regmap;

	struct clk *mclk;

	int revision;

};



/*
@@ -1300,9 +1301,7 @@ static int sgtl5000_replace_vddd_with_ldo(struct snd_soc_codec *codec) 


static int sgtl5000_enable_regulators(struct snd_soc_codec *codec)

{

	int reg;

	int ret;

	int rev;

	int i;

	int external_vddd = 0;

	struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);
@@ -1332,14 +1331,7 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) 
	 * workaround for revision 0x11 and later,

	 * roll back to use internal LDO

	 */



	ret = regmap_read(sgtl5000->regmap, SGTL5000_CHIP_ID, &reg);

	if (ret)

		goto err_regulator_disable;



	rev = (reg & SGTL5000_REVID_MASK) >> SGTL5000_REVID_SHIFT;



	if (external_vddd && rev >= 0x11) {

	if (external_vddd && sgtl5000->revision >= 0x11) {

		/* disable all regulator first */

		regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),

					sgtl5000->supplies);
@@ -1362,9 +1354,6 @@ static int sgtl5000_enable_regulators(struct snd_soc_codec *codec) 


	return 0;



err_regulator_disable:

	regulator_bulk_disable(ARRAY_SIZE(sgtl5000->supplies),

				sgtl5000->supplies);

err_regulator_free:

	regulator_bulk_free(ARRAY_SIZE(sgtl5000->supplies),

				sgtl5000->supplies);
@@ -1566,6 +1555,7 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, 


	rev = (reg & SGTL5000_REVID_MASK) >> SGTL5000_REVID_SHIFT;

	dev_info(&client->dev, "sgtl5000 revision 0x%x\n", rev);

	sgtl5000->revision = rev;



	i2c_set_clientdata(client, sgtl5000);