Unverified Commit d7a8940d authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: cs42l42: Fixes to power-down" from Richard Fitzgerald... 

Merge series "ASoC: cs42l42: Fixes to power-down" from Richard Fitzgerald <rf@opensource.cirrus.com>:

Driver probe and remove were inconsistent in what they did to power-down
and neither did all steps. In addition to that, neither function
prevented the interrupt handler from running during and after power-down.

Richard Fitzgerald (2):
  ASoC: cs42l42: Reset and power-down on remove() and failed probe()
  ASoC: cs42l42: free_irq() before powering-down on probe() fail

 sound/soc/codecs/cs42l42.c | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

--
2.11.0
parents 1af4d2e7 a10148a8

sound/soc/codecs/cs42l42.c

+31 −12
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) {
@@ -2078,17 +2078,16 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, 


	/* Request IRQ if one was specified */

	if (i2c_client->irq) {

		ret = devm_request_threaded_irq(&i2c_client->dev,

						i2c_client->irq,

		ret = request_threaded_irq(i2c_client->irq,

					   NULL, cs42l42_irq_thread,

					   IRQF_ONESHOT | IRQF_TRIGGER_LOW,

					   "cs42l42", cs42l42);

		if (ret == -EPROBE_DEFER) {

			goto err_disable;

			goto err_disable_noirq;

		} else if (ret != 0) {

			dev_err(&i2c_client->dev,

				"Failed to request IRQ: %d\n", ret);

			goto err_disable;

			goto err_disable_noirq;

		}

	}
@@ -2111,7 +2110,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 +2135,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 +2147,22 @@ 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:

	if (i2c_client->irq)

		free_irq(i2c_client->irq, cs42l42);



err_disable_noirq:

	gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);

err_disable_noreset:

	regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),

				cs42l42->supplies);

	return ret;
@@ -2162,7 +2173,15 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client) 
	struct cs42l42_private *cs42l42 = i2c_get_clientdata(i2c_client);



	if (i2c_client->irq)

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

		free_irq(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);