Unverified Commit 6cb725b8 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: cs42l42: Reset and power-down on remove() and failed probe() 



Driver remove() should assert RESET and disable the supplies.

probe() fail was disabling supplies but it didn't assert reset or
put the codec into a power-down state.

Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211026125722.10220-2-rf@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1198ff12

sound/soc/codecs/cs42l42.c

+20 −4
Original line number Diff line number Diff line
@@ -2067,7 +2067,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, 
		"reset", GPIOD_OUT_LOW);

	if (IS_ERR(cs42l42->reset_gpio)) {

		ret = PTR_ERR(cs42l42->reset_gpio);

		goto err_disable;

		goto err_disable_noreset;

	}



	if (cs42l42->reset_gpio) {
@@ -2111,7 +2111,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, 
	ret = regmap_read(cs42l42->regmap, CS42L42_REVID, &reg);

	if (ret < 0) {

		dev_err(&i2c_client->dev, "Get Revision ID failed\n");

		goto err_disable;

		goto err_shutdown;

	}



	dev_info(&i2c_client->dev,
@@ -2136,7 +2136,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, 


	ret = cs42l42_handle_device_data(&i2c_client->dev, cs42l42);

	if (ret != 0)

		goto err_disable;

		goto err_shutdown;



	/* Setup headset detection */

	cs42l42_setup_hs_type_detect(cs42l42);
@@ -2148,10 +2148,18 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, 
	ret = devm_snd_soc_register_component(&i2c_client->dev,

			&soc_component_dev_cs42l42, &cs42l42_dai, 1);

	if (ret < 0)

		goto err_disable;

		goto err_shutdown;



	return 0;



err_shutdown:

	regmap_write(cs42l42->regmap, CS42L42_CODEC_INT_MASK, 0xff);

	regmap_write(cs42l42->regmap, CS42L42_TSRS_PLUG_INT_MASK, 0xff);

	regmap_write(cs42l42->regmap, CS42L42_PWR_CTL1, 0xff);



err_disable:

	gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);

err_disable_noreset:

	regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),

				cs42l42->supplies);

	return ret;
@@ -2164,6 +2172,14 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client) 
	if (i2c_client->irq)

		devm_free_irq(&i2c_client->dev, i2c_client->irq, cs42l42);



	/*

	 * The driver might not have control of reset and power supplies,

	 * so ensure that the chip internals are powered down.

	 */

	regmap_write(cs42l42->regmap, CS42L42_CODEC_INT_MASK, 0xff);

	regmap_write(cs42l42->regmap, CS42L42_TSRS_PLUG_INT_MASK, 0xff);

	regmap_write(cs42l42->regmap, CS42L42_PWR_CTL1, 0xff);



	gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);

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