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

Commit 8f90409f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/cs35l33', 'asoc/topic/cs35l34' and... 

Merge remote-tracking branches 'asoc/topic/cs35l33', 'asoc/topic/cs35l34' and 'asoc/topic/cs42l42' into asoc-next
parents a641ed5e c5660778 db3be255 72a63c6e

sound/soc/codecs/cs35l33.c

+4 −8
Original line number Diff line number Diff line
@@ -869,7 +869,6 @@ static int __maybe_unused cs35l33_runtime_resume(struct device *dev) 


	dev_dbg(dev, "%s\n", __func__);



	if (cs35l33->reset_gpio)

	gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);



	ret = regulator_bulk_enable(cs35l33->num_core_supplies,
@@ -881,7 +880,6 @@ static int __maybe_unused cs35l33_runtime_resume(struct device *dev) 


	regcache_cache_only(cs35l33->regmap, false);



	if (cs35l33->reset_gpio)

	gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);



	msleep(CS35L33_BOOT_DELAY);
@@ -1191,7 +1189,6 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client, 
		return ret;

	}



	if (cs35l33->reset_gpio)

	gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);



	msleep(CS35L33_BOOT_DELAY);
@@ -1262,7 +1259,6 @@ static int cs35l33_i2c_remove(struct i2c_client *client) 


	snd_soc_unregister_codec(&client->dev);



	if (cs35l33->reset_gpio)

	gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);



	pm_runtime_disable(&client->dev);

sound/soc/codecs/cs35l34.c

+1 −2
Original line number Diff line number Diff line
@@ -1138,7 +1138,6 @@ static int cs35l34_i2c_remove(struct i2c_client *client) 


	snd_soc_unregister_codec(&client->dev);



	if (cs35l34->reset_gpio)

	gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);



	pm_runtime_disable(&client->dev);

sound/soc/codecs/cs42l42.c

+3 −6
Original line number Diff line number Diff line
@@ -1898,7 +1898,6 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client) 
	snd_soc_unregister_codec(&i2c_client->dev);



	/* Hold down reset */

	if (cs42l42->reset_gpio)

	gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);



	return 0;
@@ -1913,7 +1912,6 @@ static int cs42l42_runtime_suspend(struct device *dev) 
	regcache_mark_dirty(cs42l42->regmap);



	/* Hold down reset */

	if (cs42l42->reset_gpio)

	gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);



	/* remove power */
@@ -1937,7 +1935,6 @@ static int cs42l42_runtime_resume(struct device *dev) 
		return ret;

	}



	if (cs42l42->reset_gpio)

	gpiod_set_value_cansleep(cs42l42->reset_gpio, 1);



	regcache_cache_only(cs42l42->regmap, false);