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

Commit f219b169 authored by Eric Nelson's avatar Eric Nelson Committed by Mark Brown
Browse files

ASoC: sgtl5000: Write all default registers 



If an error occurs writing defaults, produce an error message but
continue writing other registers. The failure of a single write should
not cause catastrophic device failure.

In at least one occurrence, I2C writes of CHIP_ANA_POWER were nacked,
though continuing allowed the device to operate properly.

Signed-off-by: default avatarEric Nelson <eric@nelint.com>
Signed-off-by: default avatarClemens Gruber <clemens.gruber@pqgruber.com>
Tested-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 940adb28

sound/soc/codecs/sgtl5000.c

+6 −7
Original line number Diff line number Diff line
@@ -1219,8 +1219,9 @@ static const struct regmap_config sgtl5000_regmap = { 
 * and avoid problems like, not being able to probe after an audio playback

 * followed by a system reset or a 'reboot' command in Linux

 */

static int sgtl5000_fill_defaults(struct sgtl5000_priv *sgtl5000)

static void sgtl5000_fill_defaults(struct i2c_client *client)

{

	struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client);

	int i, ret, val, index;



	for (i = 0; i < ARRAY_SIZE(sgtl5000_reg_defaults); i++) {
@@ -1228,10 +1229,10 @@ static int sgtl5000_fill_defaults(struct sgtl5000_priv *sgtl5000) 
		index = sgtl5000_reg_defaults[i].reg;

		ret = regmap_write(sgtl5000->regmap, index, val);

		if (ret)

			return ret;

			dev_err(&client->dev,

				"%s: error %d setting reg 0x%02x to 0x%04x\n",

				__func__, ret, index, val);

	}



	return 0;

}



static int sgtl5000_i2c_probe(struct i2c_client *client,
@@ -1364,9 +1365,7 @@ static int sgtl5000_i2c_probe(struct i2c_client *client, 
	}



	/* Ensure sgtl5000 will start with sane register values */

	ret = sgtl5000_fill_defaults(sgtl5000);

	if (ret)

		goto disable_clk;

	sgtl5000_fill_defaults(client);



	ret = snd_soc_register_codec(&client->dev,

			&sgtl5000_driver, &sgtl5000_dai, 1);