diff options
| author | Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org> | 2016-06-22 00:20:06 +0530 |
|---|---|---|
| committer | Yeleswarapu Nagaradhesh <nagaradh@codeaurora.org> | 2016-07-15 05:59:14 +0530 |
| commit | eb8519c0afe518391846332d389b4f9cfd13804f (patch) | |
| tree | 961632a39778278c53ebf3f8230a4164f7c15d52 /include/linux/mfd | |
| parent | 400520a6e2f06cc7c45e386e769a85d4aded565b (diff) | |
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 <nagaradh@codeaurora.org>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/msm-cdc-pinctrl.h | 6 | ||||
| -rw-r--r-- | include/linux/mfd/wcd9xxx/core.h | 1 |
2 files changed, 7 insertions, 0 deletions
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]; }; |