diff options
Diffstat (limited to 'sound/soc/intel/boards/sof_sdw_common.h')
| -rw-r--r-- | sound/soc/intel/boards/sof_sdw_common.h | 98 | 
1 files changed, 64 insertions, 34 deletions
diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h index b1d57034361c..3dfba6f6b95d 100644 --- a/sound/soc/intel/boards/sof_sdw_common.h +++ b/sound/soc/intel/boards/sof_sdw_common.h @@ -45,12 +45,26 @@ enum {  };  #define SOF_JACK_JDSRC(quirk)		((quirk) & GENMASK(3, 0)) +/* Deprecated and no longer supported by the code */  #define SOF_SDW_FOUR_SPK		BIT(4)  #define SOF_SDW_TGL_HDMI		BIT(5)  #define SOF_SDW_PCH_DMIC		BIT(6)  #define SOF_SSP_PORT(x)		(((x) & GENMASK(5, 0)) << 7)  #define SOF_SSP_GET_PORT(quirk)	(((quirk) >> 7) & GENMASK(5, 0)) +/* Deprecated and no longer supported by the code */  #define SOF_SDW_NO_AGGREGATION		BIT(14) +/* If a CODEC has an optional speaker output, this quirk will enable it */ +#define SOF_CODEC_SPKR			BIT(15) +/* + * If the CODEC has additional devices attached directly to it. + * + * For the cs42l43: + *   - 0 - No speaker output + *   - SOF_CODEC_SPKR - CODEC internal speaker + *   - SOF_SIDECAR_AMPS - 2x Sidecar amplifiers + CODEC internal speaker + *   - SOF_CODEC_SPKR | SOF_SIDECAR_AMPS - Not currently supported + */ +#define SOF_SIDECAR_AMPS		BIT(16)  /* BT audio offload: reserve 3 bits for future */  #define SOF_BT_OFFLOAD_SSP_SHIFT	15 @@ -63,7 +77,7 @@ enum {  #define SOF_SDW_DAI_TYPE_AMP		1  #define SOF_SDW_DAI_TYPE_MIC		2 -#define SOF_SDW_MAX_DAI_NUM		3 +#define SOF_SDW_MAX_DAI_NUM		8  struct sof_sdw_codec_info; @@ -72,14 +86,18 @@ struct sof_sdw_dai_info {  	const char *dai_name;  	const int dai_type;  	const int dailink[2]; /* dailink id for each direction */ +	const struct snd_kcontrol_new *controls; +	const int num_controls; +	const struct snd_soc_dapm_widget *widgets; +	const int num_widgets;  	int  (*init)(struct snd_soc_card *card, -		     const struct snd_soc_acpi_link_adr *link,  		     struct snd_soc_dai_link *dai_links,  		     struct sof_sdw_codec_info *info,  		     bool playback);  	int (*exit)(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); -	int (*rtd_init)(struct snd_soc_pcm_runtime *rtd); +	int (*rtd_init)(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);  	bool rtd_init_done; /* Indicate that the rtd_init callback is done */ +	unsigned long quirk;  };  struct sof_sdw_codec_info { @@ -94,19 +112,32 @@ struct sof_sdw_codec_info {  	const int dai_num;  	int (*codec_card_late_probe)(struct snd_soc_card *card); + +	int  (*count_sidecar)(struct snd_soc_card *card, +			      int *num_dais, int *num_devs); +	int  (*add_sidecar)(struct snd_soc_card *card, +			    struct snd_soc_dai_link **dai_links, +			    struct snd_soc_codec_conf **codec_conf);  };  struct mc_private { +	struct snd_soc_card card;  	struct snd_soc_jack sdw_headset;  	struct sof_hdmi_private hdmi;  	struct device *headset_codec_dev; /* only one headset per card */  	struct device *amp_dev1, *amp_dev2;  	/* To store SDW Pin index for each SoundWire link */  	unsigned int sdw_pin_index[SDW_MAX_LINKS]; +	bool append_dai_type; +	bool ignore_pch_dmic;  };  extern unsigned long sof_sdw_quirk; +struct snd_soc_dai *get_codec_dai_by_name(struct snd_soc_pcm_runtime *rtd, +					  const char * const dai_name[], +					  int num_dais); +  int sdw_startup(struct snd_pcm_substream *substream);  int sdw_prepare(struct snd_pcm_substream *substream);  int sdw_trigger(struct snd_pcm_substream *substream, int cmd); @@ -125,7 +156,6 @@ int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);  /* RT711 support */  int sof_sdw_rt711_init(struct snd_soc_card *card, -		       const struct snd_soc_acpi_link_adr *link,  		       struct snd_soc_dai_link *dai_links,  		       struct sof_sdw_codec_info *info,  		       bool playback); @@ -133,7 +163,6 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l  /* RT711-SDCA support */  int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card, -			      const struct snd_soc_acpi_link_adr *link,  			      struct snd_soc_dai_link *dai_links,  			      struct sof_sdw_codec_info *info,  			      bool playback); @@ -144,53 +173,54 @@ extern struct snd_soc_ops sof_sdw_rt1308_i2s_ops;  /* generic amp support */  int sof_sdw_rt_amp_init(struct snd_soc_card *card, -			const struct snd_soc_acpi_link_adr *link,  			struct snd_soc_dai_link *dai_links,  			struct sof_sdw_codec_info *info,  			bool playback);  int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); -/* RT722-SDCA support */ -int sof_sdw_rt722_spk_init(struct snd_soc_card *card, -			   const struct snd_soc_acpi_link_adr *link, -			   struct snd_soc_dai_link *dai_links, -			   struct sof_sdw_codec_info *info, -			   bool playback); -int sof_sdw_rt722_sdca_dmic_init(struct snd_soc_card *card, -				 const struct snd_soc_acpi_link_adr *link, -				 struct snd_soc_dai_link *dai_links, -				 struct sof_sdw_codec_info *info, -				 bool playback); -  /* MAXIM codec support */  int sof_sdw_maxim_init(struct snd_soc_card *card, -		       const struct snd_soc_acpi_link_adr *link,  		       struct snd_soc_dai_link *dai_links,  		       struct sof_sdw_codec_info *info,  		       bool playback); +/* CS42L43 support */ +int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, +			     struct snd_soc_dai_link *dai_links, +			     struct sof_sdw_codec_info *info, +			     bool playback); +  /* CS AMP support */ +int bridge_cs35l56_count_sidecar(struct snd_soc_card *card, +				 int *num_dais, int *num_devs); +int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, +			       struct snd_soc_dai_link **dai_links, +			       struct snd_soc_codec_conf **codec_conf); +int bridge_cs35l56_spk_init(struct snd_soc_card *card, +			    struct snd_soc_dai_link *dai_links, +			    struct sof_sdw_codec_info *info, +			    bool playback); +  int sof_sdw_cs_amp_init(struct snd_soc_card *card, -			const struct snd_soc_acpi_link_adr *link,  			struct snd_soc_dai_link *dai_links,  			struct sof_sdw_codec_info *info,  			bool playback);  /* dai_link init callbacks */ -int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd); -int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd); -int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd); -int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd); -int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt712_sdca_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt715_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt715_sdca_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd); -int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd); +int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); +int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);  #endif  |