[alsa-devel] [PATCH 08/11] ASoC: Intel: boards: Update skl_nau88l25_ssm4567 driver to support chmap

[Subhransu S. Prusty]

On Tue, Apr 12, 2016 at 07:32:35AM -0500, Pierre-Louis Bossart wrote:
> patches 6,7,8 use the same code to add HDMI to the machine driver.
> Can this be factored instead of copy/pasted?

Agree. This can be factored into a common file. It's not only HDMI which is
common to these three files, there are some more code which are common as
well. After the multichannel series is merged, I will submit a patch to
factor these into a common file.

> 
> On 04/12/2016 12:01 AM, Subhransu S. Prusty wrote:
> >HDMI registers channel map controls per PCM. As PCMs are not
> >registered during dai_link init callback, store the pcm ids and
> >codec DAIs during this init callback.
> >
> >Register for late probe and call the jack_init API which also
> >registers channel map in the late probe callback handler.
> >
> >Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty at intel.com>
> >Signed-off-by: Vinod Koul <vinod.koul at intel.com>
> >---
> >  sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 73 +++++++++++++++++++++++++--
> >  1 file changed, 70 insertions(+), 3 deletions(-)
> >
> >diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
> >index 5f1ca99..968fc74 100644
> >--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
> >+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
> >@@ -34,6 +34,15 @@
> >  static struct snd_soc_jack skylake_headset;
> >  static struct snd_soc_card skylake_audio_card;
> >+struct skl_hdmi_pcm {
> >+	struct list_head head;
> >+	struct snd_soc_dai *codec_dai;
> >+	int device;
> >+};
> >+
> >+struct skl_nau88125_private {
> >+	struct list_head hdmi_pcm_list;
> >+};
> >  enum {
> >  	SKL_DPCM_AUDIO_PB = 0,
> >  	SKL_DPCM_AUDIO_CP,
> >@@ -222,24 +231,57 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
> >  static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd)
> >  {
> >+	struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card);
> >  	struct snd_soc_dai *dai = rtd->codec_dai;
> >+	struct skl_hdmi_pcm *pcm;
> >+
> >+	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
> >+	if (!pcm)
> >+		return -ENOMEM;
> >+
> >+	pcm->device = SKL_DPCM_AUDIO_HDMI1_PB;
> >+	pcm->codec_dai = dai;
> >+
> >+	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
> >-	return hdac_hdmi_jack_init(dai, SKL_DPCM_AUDIO_HDMI1_PB);
> >+	return 0;
> >  }
> >  static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd)
> >  {
> >+	struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card);
> >  	struct snd_soc_dai *dai = rtd->codec_dai;
> >+	struct skl_hdmi_pcm *pcm;
> >+
> >+	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
> >+	if (!pcm)
> >+		return -ENOMEM;
> >+
> >+	pcm->device = SKL_DPCM_AUDIO_HDMI2_PB;
> >+	pcm->codec_dai = dai;
> >-	return hdac_hdmi_jack_init(dai, SKL_DPCM_AUDIO_HDMI2_PB);
> >+	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
> >+
> >+	return 0;
> >  }
> >  static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd)
> >  {
> >+	struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(rtd->card);
> >  	struct snd_soc_dai *dai = rtd->codec_dai;
> >+	struct skl_hdmi_pcm *pcm;
> >+
> >+	pcm = devm_kzalloc(rtd->card->dev, sizeof(*pcm), GFP_KERNEL);
> >+	if (!pcm)
> >+		return -ENOMEM;
> >-	return hdac_hdmi_jack_init(dai, SKL_DPCM_AUDIO_HDMI3_PB);
> >+	pcm->device = SKL_DPCM_AUDIO_HDMI3_PB;
> >+	pcm->codec_dai = dai;
> >+
> >+	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
> >+
> >+	return 0;
> >  }
> >  static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd)
> >@@ -585,6 +627,21 @@ static struct snd_soc_dai_link skylake_dais[] = {
> >  	},
> >  };
> >+int skylake_card_late_probe(struct snd_soc_card *card)
> >+{
> >+	struct skl_nau88125_private *ctx = snd_soc_card_get_drvdata(card);
> >+	struct skl_hdmi_pcm *pcm;
> >+	int err;
> >+
> >+	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
> >+		err = hdac_hdmi_jack_init(pcm->codec_dai, pcm->device);
> >+		if (err < 0)
> >+			return err;
> >+	}
> >+
> >+	return 0;
> >+}
> >+
> >  /* skylake audio machine driver for SPT + NAU88L25 */
> >  static struct snd_soc_card skylake_audio_card = {
> >  	.name = "sklnau8825adi",
> >@@ -600,11 +657,21 @@ static struct snd_soc_card skylake_audio_card = {
> >  	.codec_conf = ssm4567_codec_conf,
> >  	.num_configs = ARRAY_SIZE(ssm4567_codec_conf),
> >  	.fully_routed = true,
> >+	.late_probe = skylake_card_late_probe,
> >  };
> >  static int skylake_audio_probe(struct platform_device *pdev)
> >  {
> >+	struct skl_nau88125_private *ctx;
> >+
> >+	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);
> >+	if (!ctx)
> >+		return -ENOMEM;
> >+
> >+	INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
> >+
> >  	skylake_audio_card.dev = &pdev->dev;
> >+	snd_soc_card_set_drvdata(&skylake_audio_card, ctx);
> >  	return devm_snd_soc_register_card(&pdev->dev, &skylake_audio_card);
> >  }
> 

--