Commit 6702dfcc authored by Sergey Kiselev's avatar Sergey Kiselev Committed by Mark Brown
Browse files

ASoC: wm8731: initialize the hardware when loading the codec driver 



This patch moves the requesting supplies, hardware reset and
initialization from wm8731_probe to wm8731_i2c_probe and wm8731_spi_probe.
So that the codec hardware is initialized when loading the codec driver,
and not when loading the machine driver. This avoids unnecesary hardware
resets and re-initializations when re-loading the machine driver.

Signed-off-by: default avatarSergey Kiselev <sergey.kiselev@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d770e558

sound/soc/codecs/wm8731.c

+42 −32
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static bool wm8731_writeable(struct device *dev, unsigned int reg) 
	return reg <= WM8731_RESET;

}



#define wm8731_reset(c)	snd_soc_write(c, WM8731_RESET, 0)

#define wm8731_reset(m)	regmap_write(m, WM8731_RESET, 0)



static const char *wm8731_input_select[] = {"Line In", "Mic"};
@@ -571,69 +571,63 @@ static struct snd_soc_dai_driver wm8731_dai = { 
	.symmetric_rates = 1,

};



static int wm8731_probe(struct snd_soc_codec *codec)

static int wm8731_request_supplies(struct device *dev,

		struct wm8731_priv *wm8731)

{

	struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);

	int ret = 0, i;



	for (i = 0; i < ARRAY_SIZE(wm8731->supplies); i++)

		wm8731->supplies[i].supply = wm8731_supply_names[i];



	ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8731->supplies),

	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(wm8731->supplies),

				 wm8731->supplies);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to request supplies: %d\n", ret);

		dev_err(dev, "Failed to request supplies: %d\n", ret);

		return ret;

	}



	ret = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies),

				    wm8731->supplies);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);

		dev_err(dev, "Failed to enable supplies: %d\n", ret);

		return ret;

	}



	ret = wm8731_reset(codec);

	return 0;

}



static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731)

{

	int ret = 0;



	ret = wm8731_reset(wm8731->regmap);

	if (ret < 0) {

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

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

		goto err_regulator_enable;

	}



	snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY);

	/* Clear POWEROFF, keep everything else disabled */

	regmap_write(wm8731->regmap, WM8731_PWR, 0x7f);



	/* Latch the update bits */

	snd_soc_update_bits(codec, WM8731_LOUT1V, 0x100, 0);

	snd_soc_update_bits(codec, WM8731_ROUT1V, 0x100, 0);

	snd_soc_update_bits(codec, WM8731_LINVOL, 0x100, 0);

	snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0);

	regmap_update_bits(wm8731->regmap, WM8731_LOUT1V, 0x100, 0);

	regmap_update_bits(wm8731->regmap, WM8731_ROUT1V, 0x100, 0);

	regmap_update_bits(wm8731->regmap, WM8731_LINVOL, 0x100, 0);

	regmap_update_bits(wm8731->regmap, WM8731_RINVOL, 0x100, 0);



	/* Disable bypass path by default */

	snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0);



	/* Regulators will have been enabled by bias management */

	regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);

	regmap_update_bits(wm8731->regmap, WM8731_APANA, 0x8, 0);



	return 0;

	regcache_mark_dirty(wm8731->regmap);



err_regulator_enable:

	/* Regulators will be enabled by bias management */

	regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);



	return ret;

}



/* power down chip */

static int wm8731_remove(struct snd_soc_codec *codec)

{

	struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);



	regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies);



	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {

	.probe =	wm8731_probe,

	.remove =	wm8731_remove,

	.set_bias_level = wm8731_set_bias_level,

	.suspend_bias_off = true,
@@ -690,6 +684,12 @@ static int wm8731_spi_probe(struct spi_device *spi) 


	mutex_init(&wm8731->lock);



	spi_set_drvdata(spi, wm8731);



	ret = wm8731_request_supplies(&spi->dev, wm8731);

	if (ret != 0)

		return ret;



	wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap);

	if (IS_ERR(wm8731->regmap)) {

		ret = PTR_ERR(wm8731->regmap);
@@ -698,7 +698,9 @@ static int wm8731_spi_probe(struct spi_device *spi) 
		return ret;

	}



	spi_set_drvdata(spi, wm8731);

	ret = wm8731_hw_init(&spi->dev, wm8731);

	if (ret != 0)

		return ret;



	ret = snd_soc_register_codec(&spi->dev,

			&soc_codec_dev_wm8731, &wm8731_dai, 1);
@@ -754,6 +756,12 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, 


	mutex_init(&wm8731->lock);



	i2c_set_clientdata(i2c, wm8731);



	ret = wm8731_request_supplies(&i2c->dev, wm8731);

	if (ret != 0)

		return ret;



	wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap);

	if (IS_ERR(wm8731->regmap)) {

		ret = PTR_ERR(wm8731->regmap);
@@ -762,7 +770,9 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, 
		return ret;

	}



	i2c_set_clientdata(i2c, wm8731);

	ret = wm8731_hw_init(&i2c->dev, wm8731);

	if (ret != 0)

		return ret;



	ret = snd_soc_register_codec(&i2c->dev,

			&soc_codec_dev_wm8731, &wm8731_dai, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE