From eb8519c0afe518391846332d389b4f9cfd13804f Mon Sep 17 00:00:00 2001 From: Yeleswarapu Nagaradhesh Date: Wed, 22 Jun 2016 00:20:06 +0530 Subject: drivers: mfd: do not modify reset gpio if codec is identified If target can support multiple codecs, only one of the codecs will be enumerated. Do not clean up common resources when other codec fails to enumerate. CRs-Fixed: 1041199 Change-Id: I74a298739925b5763458c2e637372aa8f2c2aa55 Signed-off-by: Yeleswarapu Nagaradhesh --- include/linux/mfd/msm-cdc-pinctrl.h | 6 ++++++ include/linux/mfd/wcd9xxx/core.h | 1 + 2 files changed, 7 insertions(+) (limited to 'include/linux/mfd') diff --git a/include/linux/mfd/msm-cdc-pinctrl.h b/include/linux/mfd/msm-cdc-pinctrl.h index 395b935b6aec..951b8d4d1ed9 100644 --- a/include/linux/mfd/msm-cdc-pinctrl.h +++ b/include/linux/mfd/msm-cdc-pinctrl.h @@ -20,6 +20,7 @@ extern int msm_cdc_pinctrl_select_sleep_state(struct device_node *); extern int msm_cdc_pinctrl_select_active_state(struct device_node *); extern bool msm_cdc_pinctrl_get_state(struct device_node *); +extern int msm_cdc_get_gpio_state(struct device_node *); #else int msm_cdc_pinctrl_select_sleep_state(struct device_node *np) @@ -30,6 +31,11 @@ int msm_cdc_pinctrl_select_active_state(struct device_node *np) { return 0; } +int msm_cdc_get_gpio_state(struct device_node *np) +{ + return 0; +} +# #endif #endif diff --git a/include/linux/mfd/wcd9xxx/core.h b/include/linux/mfd/wcd9xxx/core.h index 96937a4338a8..c56ad3afcd46 100644 --- a/include/linux/mfd/wcd9xxx/core.h +++ b/include/linux/mfd/wcd9xxx/core.h @@ -328,6 +328,7 @@ struct wcd9xxx { struct wcd9xxx_codec_type *codec_type; bool prev_pg_valid; u8 prev_pg; + u8 avoid_cdc_rstlow; struct wcd9xxx_power_region *wcd9xxx_pwr[WCD9XXX_MAX_PWR_REGIONS]; }; -- cgit v1.2.3