提交 f219b169 编写于 作者: E Eric Nelson 提交者: Mark Brown

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: NEric Nelson <eric@nelint.com>
Signed-off-by: NClemens Gruber <clemens.gruber@pqgruber.com>
Tested-by: NFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 940adb28
...@@ -1219,8 +1219,9 @@ static const struct regmap_config sgtl5000_regmap = { ...@@ -1219,8 +1219,9 @@ static const struct regmap_config sgtl5000_regmap = {
* and avoid problems like, not being able to probe after an audio playback * and avoid problems like, not being able to probe after an audio playback
* followed by a system reset or a 'reboot' command in Linux * 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; int i, ret, val, index;
for (i = 0; i < ARRAY_SIZE(sgtl5000_reg_defaults); i++) { for (i = 0; i < ARRAY_SIZE(sgtl5000_reg_defaults); i++) {
...@@ -1228,10 +1229,10 @@ static int sgtl5000_fill_defaults(struct sgtl5000_priv *sgtl5000) ...@@ -1228,10 +1229,10 @@ static int sgtl5000_fill_defaults(struct sgtl5000_priv *sgtl5000)
index = sgtl5000_reg_defaults[i].reg; index = sgtl5000_reg_defaults[i].reg;
ret = regmap_write(sgtl5000->regmap, index, val); ret = regmap_write(sgtl5000->regmap, index, val);
if (ret) 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, static int sgtl5000_i2c_probe(struct i2c_client *client,
...@@ -1364,9 +1365,7 @@ 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 */ /* Ensure sgtl5000 will start with sane register values */
ret = sgtl5000_fill_defaults(sgtl5000); sgtl5000_fill_defaults(client);
if (ret)
goto disable_clk;
ret = snd_soc_register_codec(&client->dev, ret = snd_soc_register_codec(&client->dev,
&sgtl5000_driver, &sgtl5000_dai, 1); &sgtl5000_driver, &sgtl5000_dai, 1);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册