From: yao zhengming Date: Thu, 24 Jan 2019 11:01:16 +0000 (-0500) Subject: Madera:Pick cirrus' patch from ODM's base X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f40130f2d30fda123d454367c1af649ccf9dfedd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Madera:Pick cirrus' patch from ODM's base (CR):[Kane][audio]kernel:Add soft reset as part of resume 1,madera can not power down DCVDD ,so need soft reset when resume Change-Id: I3d3291c25c6a846bcf3123fc8d1f0741a3963eb0 Signed-off-by: zhangjiaquan (cherry picked from commit 71c5fd1c8dfaf351ff9eec2aae7bd98926eb9741) Signed-off-by: yaozm1 Reviewed-on: https://gerrit.mot.com/1300905 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c index 7c327fb6d0e6..098156b951fc 100755 --- a/drivers/mfd/madera-core.c +++ b/drivers/mfd/madera-core.c @@ -289,6 +289,13 @@ static int madera_runtime_resume(struct device *dev) regcache_cache_only(madera->regmap, false); regcache_cache_only(madera->regmap_32bit, false); + usleep_range(2000, 3000); + ret = madera_soft_reset(madera); + if (ret) { + dev_err(dev, "Failed to reset: %d\n", ret); + goto err; + } + ret = madera_wait_for_boot(madera); if (ret) goto err;