Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a10612f authored by Subhransu S. Prusty's avatar Subhransu S. Prusty Committed by Mark Brown
Browse files

ASoC: skl_rt286: Fix to support hdmi channel map support 



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.

The patch following the machine driver changes adds the channel
map control in the hdac_hdmi codec driver.

Signed-off-by: default avatarSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bcced704

sound/soc/intel/boards/skl_rt286.c

+47 −1
Original line number Original line Diff line number Diff line
@@ -30,6 +30,16 @@ 




static struct snd_soc_jack skylake_headset;

static struct snd_soc_jack skylake_headset;





struct skl_hdmi_pcm {

	struct list_head head;

	struct snd_soc_dai *codec_dai;

	int device;

};



struct skl_rt286_private {

	struct list_head hdmi_pcm_list;

};



enum {

enum {

	SKL_DPCM_AUDIO_PB = 0,

	SKL_DPCM_AUDIO_PB = 0,

	SKL_DPCM_AUDIO_CP,

	SKL_DPCM_AUDIO_CP,
@@ -142,9 +152,20 @@ static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) 




static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd)

static int skylake_hdmi_init(struct snd_soc_pcm_runtime *rtd)

{

{

	struct skl_rt286_private *ctx = snd_soc_card_get_drvdata(rtd->card);

	struct snd_soc_dai *dai = rtd->codec_dai;

	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_HDMI1_PB + dai->id);

	pcm->device = SKL_DPCM_AUDIO_HDMI1_PB + dai->id;

	pcm->codec_dai = dai;



	list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);



	return 0;

}

}





static unsigned int rates[] = {

static unsigned int rates[] = {
@@ -438,6 +459,21 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { 
	},

	},

};

};





static int skylake_card_late_probe(struct snd_soc_card *card)

{

	struct skl_rt286_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 + RT286S */

/* skylake audio machine driver for SPT + RT286S */

static struct snd_soc_card skylake_rt286 = {

static struct snd_soc_card skylake_rt286 = {

	.name = "skylake-rt286",

	.name = "skylake-rt286",
@@ -451,11 +487,21 @@ static struct snd_soc_card skylake_rt286 = { 
	.dapm_routes = skylake_rt286_map,

	.dapm_routes = skylake_rt286_map,

	.num_dapm_routes = ARRAY_SIZE(skylake_rt286_map),

	.num_dapm_routes = ARRAY_SIZE(skylake_rt286_map),

	.fully_routed = true,

	.fully_routed = true,

	.late_probe = skylake_card_late_probe,

};

};





static int skylake_audio_probe(struct platform_device *pdev)

static int skylake_audio_probe(struct platform_device *pdev)

{

{

	struct skl_rt286_private *ctx;



	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC);

	if (!ctx)

		return -ENOMEM;



	INIT_LIST_HEAD(&ctx->hdmi_pcm_list);



	skylake_rt286.dev = &pdev->dev;

	skylake_rt286.dev = &pdev->dev;

	snd_soc_card_set_drvdata(&skylake_rt286, ctx);





	return devm_snd_soc_register_card(&pdev->dev, &skylake_rt286);

	return devm_snd_soc_register_card(&pdev->dev, &skylake_rt286);

}

}