samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ASoC: swr-haptics: Remove disable regulator during system suspend"

Browse Source 
This reverts commit c3ca3bfee4.

Change-Id: I551700579adbdde84b65d1d93608f1cb7d6e4a05
This commit is contained in:
Divya Sharma
2020-08-19 11:29:46 -07:00
parent 3046358d8f
commit f77d8b513b
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
asoc/codecs/swr-haptics.c
View File

@@ -456,33 +456,48 @@ static int swr_haptics_device_down(struct swr_device *sdev)
static int swr_haptics_suspend(struct device *dev) static int swr_haptics_suspend(struct device *dev)
{ {
struct swr_haptics_dev *swr_hap; struct swr_haptics_dev *swr_hap;
int rc = 0; int rc;
swr_hap = swr_get_dev_data(to_swr_device(dev)); swr_hap = swr_get_dev_data(to_swr_device(dev));
if (!swr_hap) { if (!swr_hap) {
dev_err(dev, "%s: no data for swr_hap\n", __func__); dev_err(dev, "%s: no data for swr_hap\n", __func__);
return -ENODEV; return -ENODEV;
} }
trace_printk("%s: suspended\n", __func__);
/* Put SWR slave into reset */
rc = regulator_disable(swr_hap->vdd);
if (rc < 0) {
dev_err(swr_hap->dev, "%s: disable swr-slave failed, rc=%d\n",
__func__, rc);
return rc; return rc;
}
return 0;
} }
static int swr_haptics_resume(struct device *dev) static int swr_haptics_resume(struct device *dev)
{ {
struct swr_haptics_dev *swr_hap; struct swr_haptics_dev *swr_hap;
int rc = 0; int rc;
swr_hap = swr_get_dev_data(to_swr_device(dev)); swr_hap = swr_get_dev_data(to_swr_device(dev));
if (!swr_hap) { if (!swr_hap) {
dev_err(dev, "%s: no data for swr_hap\n", __func__); dev_err(dev, "%s: no data for swr_hap\n", __func__);
return -ENODEV; return -ENODEV;
} }
trace_printk("%s: resumed\n", __func__);
/* Take SWR slave out of reset */
rc = regulator_enable(swr_hap->vdd);
if (rc < 0) {
dev_err(swr_hap->dev, "%s: enable swr-slave failed, rc=%d\n",
__func__, rc);
return rc; return rc;
}
return 0;
} }
static const struct of_device_id swr_haptics_match_table[] = { static const struct of_device_id swr_haptics_match_table[] = {
{ .compatible = "qcom,swr-haptics", }, { .compatible = "qcom,swr-haptics", },
{ .compatible = "qcom,pm8350b-swr-haptics", }, { .compatible = "qcom,pm8350b-swr-haptics", },