Merge "asoc: codecs: stub for WCD CPE core"

This commit is contained in:
Linux Build Service Account 2018-06-19 15:52:38 -07:00 • committed by Gerrit - the friendly Code Review server
commit 25a990e3c4
3 changed files with 14 additions and 2 deletions

View file

@ -222,8 +222,22 @@ struct wcd_cpe_params {
struct cpe_svc_init_param *cpe_svc_params;
};
#if IS_ENABLED(CONFIG_SND_SOC_WCD_CPE)
int wcd_cpe_ssr_event(void *core_handle,
enum wcd_cpe_ssr_state_event event);
struct wcd_cpe_core *wcd_cpe_init(const char *img_fname,
struct snd_soc_codec *codec, struct wcd_cpe_params *params);
#else /* CONFIG_SND_SOC_WCD_CPE */
static inline int wcd_cpe_ssr_event(void *core_handle,
enum wcd_cpe_ssr_state_event event)
{
return 0;
}
static inline struct wcd_cpe_core *wcd_cpe_init(const char *img_fname,
struct snd_soc_codec *codec,
struct wcd_cpe_params *params)
{
return NULL;
}
#endif /* CONFIG_SND_SOC_WCD_CPE */
#endif

View file

@ -25,7 +25,6 @@ CONFIG_VA_MACRO=m
CONFIG_MSM_GLINK_SPI_XPRT=m
CONFIG_WCD_DSP_GLINK=m
CONFIG_SOUNDWIRE=m
CONFIG_WCD9XXX_CODEC_CORE=m
CONFIG_SND_SOC_QDSP6V2=m
CONFIG_SND_SOC_WCD_MBHC_LEGACY=m
CONFIG_QTI_PP=m

View file

@ -16,7 +16,6 @@
#define CONFIG_SND_SOC_WCD9XXX_V2 1
#define CONFIG_SND_SOC_WSA881X 1
#define CONFIG_SND_SOC_WCD_DSP_MGR 1
#define CONFIG_SND_SOC_WCD_CPE 1
#define CONFIG_SND_SOC_WCD9335 1
#define CONFIG_WCD9XXX_CODEC_CORE 1
#define CONFIG_MSM_CDC_PINCTRL 1