summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorWalter Yang <yandongy@codeaurora.org>2017-01-19 20:35:42 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-24 03:58:10 -0800
commit6250fc8f7d9727b942a832ae20becb882d7c9034 (patch)
tree2d58f1173d00cf94ad850ea7bb1d9b36572738df /drivers/mfd
parentce6b9b73089ccb4cf2d2c26fe28dacf16255091e (diff)
ASoC: wcd9xxx: check gpio pinctrl state in wcd9xxx_reset
As different kinds of gpio may be used for wcd codec reset. Check the common pinctrl state instead of the gpio hw state in wcd9xxx_reset. CRs-Fixed: 1115065 Change-Id: Ife3578a778b0612767facbc79c126be145035cde Signed-off-by: Walter Yang <yandongy@codeaurora.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/wcd9xxx-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/wcd9xxx-utils.c b/drivers/mfd/wcd9xxx-utils.c
index 909e2f77a43e..7a035cc45a18 100644
--- a/drivers/mfd/wcd9xxx-utils.c
+++ b/drivers/mfd/wcd9xxx-utils.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -669,7 +669,7 @@ int wcd9xxx_reset(struct device *dev)
return -EINVAL;
}
- value = msm_cdc_get_gpio_state(wcd9xxx->wcd_rst_np);
+ value = msm_cdc_pinctrl_get_state(wcd9xxx->wcd_rst_np);
if (value > 0) {
wcd9xxx->avoid_cdc_rstlow = 1;
return 0;