Browse Source

Merge "asoc: codecs: wcd9360: add stub functions for codec APIs" into audio-drivers.lnx.3.0

Linux Build Service Account 6 years ago
parent
commit
9b51424a82
2 changed files with 40 additions and 1 deletions
  1. 1 1
      asoc/codecs/wcd9360/wcd9360.c
  2. 39 0
      asoc/codecs/wcd9360/wcd9360.h

+ 1 - 1
asoc/codecs/wcd9360/wcd9360.c

@@ -7122,7 +7122,7 @@ static void pahu_cdc_vote_svs(struct snd_soc_codec *codec, bool vote)
 	return pahu_vote_svs(pahu, vote);
 }
 
-struct wcd_dsp_cdc_cb cdc_cb = {
+static struct wcd_dsp_cdc_cb cdc_cb = {
 	.cdc_clk_en = pahu_codec_internal_rco_ctrl,
 	.cdc_vote_svs = pahu_cdc_vote_svs,
 };

+ 39 - 0
asoc/codecs/wcd9360/wcd9360.h

@@ -127,6 +127,7 @@ struct pahu_reg_mask_val {
 	u8 val;
 };
 
+#if IS_ENABLED(CONFIG_SND_SOC_WCD9360)
 extern void *pahu_get_afe_config(struct snd_soc_codec *codec,
 				  enum afe_config_type config_type);
 extern int pahu_cdc_mclk_enable(struct snd_soc_codec *codec, bool enable);
@@ -138,4 +139,42 @@ extern int wcd9360_get_micb_vout_ctl_val(u32 micb_mv);
 extern int pahu_codec_info_create_codec_entry(
 				struct snd_info_entry *codec_root,
 				struct snd_soc_codec *codec);
+#else
+extern void *pahu_get_afe_config(struct snd_soc_codec *codec,
+				  enum afe_config_type config_type)
+{
+	return NULL;
+}
+extern int pahu_cdc_mclk_enable(struct snd_soc_codec *codec, bool enable)
+{
+	return 0;
+}
+extern int pahu_cdc_mclk_tx_enable(struct snd_soc_codec *codec, bool enable)
+{
+	return 0;
+}
+extern int pahu_set_spkr_mode(struct snd_soc_codec *codec, int mode)
+{
+	return 0;
+}
+extern int pahu_set_spkr_gain_offset(struct snd_soc_codec *codec, int offset)
+{
+	return 0;
+}
+extern void *pahu_get_wcd_dsp_cntl(struct device *dev)
+{
+	return NULL;
+}
+extern int wcd9360_get_micb_vout_ctl_val(u32 micb_mv)
+{
+	return 0;
+}
+extern int pahu_codec_info_create_codec_entry(
+				struct snd_info_entry *codec_root,
+				struct snd_soc_codec *codec)
+{
+	return 0;
+}
+#endif
+
 #endif