Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 14:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/cs35l33', 'asoc/topic/cs35l34' and 'asoc/topic/cs42l42' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2017-09-01 12:12:29 +01:00
commit 8f90409f91
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/codecs/cs35l33.c
View File

@ -869,8 +869,7 @@ static int __maybe_unused cs35l33_runtime_resume(struct device *dev)
dev_dbg(dev, "%s\n", __func__); dev_dbg(dev, "%s\n", __func__);
if (cs35l33->reset_gpio) gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
ret = regulator_bulk_enable(cs35l33->num_core_supplies, ret = regulator_bulk_enable(cs35l33->num_core_supplies,
cs35l33->core_supplies); cs35l33->core_supplies);
@ -881,8 +880,7 @@ static int __maybe_unused cs35l33_runtime_resume(struct device *dev)
regcache_cache_only(cs35l33->regmap, false); regcache_cache_only(cs35l33->regmap, false);
if (cs35l33->reset_gpio) gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
msleep(CS35L33_BOOT_DELAY); msleep(CS35L33_BOOT_DELAY);
@ -1191,8 +1189,7 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client,
return ret; return ret;
} }
if (cs35l33->reset_gpio) gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
gpiod_set_value_cansleep(cs35l33->reset_gpio, 1);
msleep(CS35L33_BOOT_DELAY); msleep(CS35L33_BOOT_DELAY);
regcache_cache_only(cs35l33->regmap, false); regcache_cache_only(cs35l33->regmap, false);
@ -1262,8 +1259,7 @@ static int cs35l33_i2c_remove(struct i2c_client *client)
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
if (cs35l33->reset_gpio) gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
gpiod_set_value_cansleep(cs35l33->reset_gpio, 0);
pm_runtime_disable(&client->dev); pm_runtime_disable(&client->dev);
regulator_bulk_disable(cs35l33->num_core_supplies, regulator_bulk_disable(cs35l33->num_core_supplies,

3
sound/soc/codecs/cs35l34.c
View File

@ -1138,8 +1138,7 @@ static int cs35l34_i2c_remove(struct i2c_client *client)
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
if (cs35l34->reset_gpio) gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);
gpiod_set_value_cansleep(cs35l34->reset_gpio, 0);
pm_runtime_disable(&client->dev); pm_runtime_disable(&client->dev);
regulator_bulk_disable(cs35l34->num_core_supplies, regulator_bulk_disable(cs35l34->num_core_supplies,

9
sound/soc/codecs/cs42l42.c
View File

@ -1898,8 +1898,7 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client)
snd_soc_unregister_codec(&i2c_client->dev); snd_soc_unregister_codec(&i2c_client->dev);
/* Hold down reset */ /* Hold down reset */
if (cs42l42->reset_gpio) gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
return 0; return 0;
} }
@ -1913,8 +1912,7 @@ static int cs42l42_runtime_suspend(struct device *dev)
regcache_mark_dirty(cs42l42->regmap); regcache_mark_dirty(cs42l42->regmap);
/* Hold down reset */ /* Hold down reset */
if (cs42l42->reset_gpio) gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
gpiod_set_value_cansleep(cs42l42->reset_gpio, 0);
/* remove power */ /* remove power */
regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies), regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies),
@ -1937,8 +1935,7 @@ static int cs42l42_runtime_resume(struct device *dev)
return ret; return ret;
} }
if (cs42l42->reset_gpio) gpiod_set_value_cansleep(cs42l42->reset_gpio, 1);
gpiod_set_value_cansleep(cs42l42->reset_gpio, 1);
regcache_cache_only(cs42l42->regmap, false); regcache_cache_only(cs42l42->regmap, false);
regcache_sync(cs42l42->regmap); regcache_sync(cs42l42->regmap);