Re: [alsa-devel] [PATCH v2 2/4] ASoC: davinci-evm: Add AM43xx-EPOS-EVM audio support

+static const struct snd_soc_dapm_widget aic31xx_dapm_widgets[] = {

• SND_SOC_DAPM_HP("Headphone Jack", NULL),
• SND_SOC_DAPM_SPK("Speaker", NULL),
• SND_SOC_DAPM_MIC("Mic Jack", NULL),

+};

+/* Logic for EVMs with an aic31xx */ +static int evm_aic31xx_init(struct snd_soc_pcm_runtime *rtd) +{

• struct snd_soc_codec *codec = rtd->codec;
• struct snd_soc_dapm_context *dapm = &codec->dapm;

Machine level DAPM elements should go into the card's DAPM context, not the CODEC context. Also use rtd->card to get a pointer to the card instead of rtd->codec->card.

• struct device_node *np = codec->card->dev->of_node;
• int ret;
• snd_soc_dapm_new_controls(dapm, aic31xx_dapm_widgets,

• 		  ARRAY_SIZE(aic31xx_dapm_widgets));
  

• if (np) {

• ret = snd_soc_of_parse_audio_routing(codec->card,
  

• 				     "ti,audio-routing");
  

• if (ret)
  

• 	return ret;
  

• }
• return 0;

+}