Unverified Commit 498a4da5 authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_nau8825: use common module for HDMI link 



Use intel_board module for Intel HDMI DAI link initialization.

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231012190826.142619-22-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c9314526

sound/soc/intel/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ config SND_SOC_INTEL_SOF_NAU8825_MACH 
	select SND_SOC_NAU8315

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_BOARD_HELPERS

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	select SND_SOC_INTEL_SOF_NUVOTON_COMMON

	select SND_SOC_INTEL_SOF_REALTEK_COMMON

sound/soc/intel/boards/sof_nau8825.c

+21 −78
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
#include <sound/soc-acpi.h>

#include "../../codecs/nau8825.h"

#include "../common/soc-intel-quirks.h"

#include "hda_dsp_common.h"

#include "sof_board_helpers.h"

#include "sof_realtek_common.h"

#include "sof_hdmi_common.h"

#include "sof_maxim_common.h"

#include "sof_nuvoton_common.h"

#include "sof_ssp_common.h"
@@ -47,24 +46,6 @@ 


static unsigned long sof_nau8825_quirk = SOF_NAU8825_SSP_CODEC(0);



struct sof_card_private {

	struct clk *mclk;

	struct snd_soc_jack sof_headset;

	struct sof_hdmi_private hdmi;

	enum sof_ssp_codec codec_type;

	enum sof_ssp_codec amp_type;

};



static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd)

{

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

	struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0);



	ctx->hdmi.hdmi_comp = dai->component;



	return 0;

}



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",
@@ -80,8 +61,7 @@ static int sof_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) 
{

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

	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;



	struct snd_soc_jack *jack;

	struct snd_soc_jack *jack = &ctx->headset_jack;

	int ret;



	/*
@@ -92,7 +72,7 @@ static int sof_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) 
					 SND_JACK_HEADSET | SND_JACK_BTN_0 |

					 SND_JACK_BTN_1 | SND_JACK_BTN_2 |

					 SND_JACK_BTN_3,

					 &ctx->sof_headset,

					 jack,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {
@@ -100,14 +80,12 @@ static int sof_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	jack = &ctx->sof_headset;



	snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);

	ret = snd_soc_component_set_jack(component, jack, NULL);



	ret = snd_soc_component_set_jack(component, jack, NULL);

	if (ret) {

		dev_err(rtd->dev, "Headset Jack call-back failed: %d\n", ret);

		return ret;
@@ -182,13 +160,7 @@ static int sof_card_late_probe(struct snd_soc_card *card) 
			return err;

	}



	if (!ctx->hdmi.idisp_codec)

		return 0;



	if (!ctx->hdmi.hdmi_comp)

		return -EINVAL;



	return hda_dsp_hdmi_build_controls(card, ctx->hdmi.hdmi_comp);

	return sof_intel_board_card_late_probe(card);

}



static const struct snd_kcontrol_new sof_controls[] = {
@@ -276,12 +248,13 @@ static struct snd_soc_dai_link_component dmic_component[] = { 
static struct snd_soc_dai_link *

sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,

			  int ssp_codec, int ssp_amp, int dmic_be_num,

			  int hdmi_num)

			  int hdmi_num, bool idisp_codec)

{

	struct snd_soc_dai_link_component *idisp_components;

	struct snd_soc_dai_link_component *cpus;

	struct snd_soc_dai_link *links;

	int i, id = 0;

	int i;

	int id = 0;

	int ret;



	links = devm_kcalloc(dev, sof_audio_card_nau8825.num_links,

			    sizeof(struct snd_soc_dai_link), GFP_KERNEL);
@@ -348,43 +321,12 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type, 
	}



	/* HDMI */

	if (hdmi_num > 0) {

		idisp_components = devm_kcalloc(dev,

						hdmi_num,

						sizeof(struct snd_soc_dai_link_component),

						GFP_KERNEL);

		if (!idisp_components)

			goto devm_err;

	}

	for (i = 1; i <= hdmi_num; i++) {

		links[id].name = devm_kasprintf(dev, GFP_KERNEL,

						"iDisp%d", i);

		if (!links[id].name)

			goto devm_err;



		links[id].id = id;

		links[id].cpus = &cpus[id];

		links[id].num_cpus = 1;

		links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,

							  "iDisp%d Pin", i);

		if (!links[id].cpus->dai_name)

			goto devm_err;



		idisp_components[i - 1].name = "ehdaudio0D2";

		idisp_components[i - 1].dai_name = devm_kasprintf(dev,

								  GFP_KERNEL,

								  "intel-hdmi-hifi%d",

								  i);

		if (!idisp_components[i - 1].dai_name)

			goto devm_err;

		ret = sof_intel_board_set_intel_hdmi_link(dev, &links[id], id,

							  i, idisp_codec);

		if (ret)

			return NULL;



		links[id].codecs = &idisp_components[i - 1];

		links[id].num_codecs = 1;

		links[id].platforms = platform_component;

		links[id].num_platforms = ARRAY_SIZE(platform_component);

		links[id].init = (i == 1) ? sof_hdmi_init : NULL;

		links[id].dpcm_playback = 1;

		links[id].no_pcm = 1;

		id++;

	}
@@ -472,7 +414,7 @@ static int sof_audio_probe(struct platform_device *pdev) 
	struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;

	struct snd_soc_dai_link *dai_links;

	struct sof_card_private *ctx;

	int dmic_be_num, hdmi_num;

	int dmic_be_num;

	int ret, ssp_amp, ssp_codec;



	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
@@ -489,11 +431,11 @@ static int sof_audio_probe(struct platform_device *pdev) 


	/* default number of DMIC DAI's */

	dmic_be_num = 2;

	hdmi_num = (sof_nau8825_quirk & SOF_NAU8825_NUM_HDMIDEV_MASK) >>

	ctx->hdmi_num = (sof_nau8825_quirk & SOF_NAU8825_NUM_HDMIDEV_MASK) >>

			SOF_NAU8825_NUM_HDMIDEV_SHIFT;

	/* default number of HDMI DAI's */

	if (!hdmi_num)

		hdmi_num = 3;

	if (!ctx->hdmi_num)

		ctx->hdmi_num = 3;



	if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)

		ctx->hdmi.idisp_codec = true;
@@ -504,7 +446,7 @@ static int sof_audio_probe(struct platform_device *pdev) 
	ssp_codec = sof_nau8825_quirk & SOF_NAU8825_SSP_CODEC_MASK;



	/* compute number of dai links */

	sof_audio_card_nau8825.num_links = 1 + dmic_be_num + hdmi_num;

	sof_audio_card_nau8825.num_links = 1 + dmic_be_num + ctx->hdmi_num;



	if (ctx->amp_type != CODEC_NONE)

		sof_audio_card_nau8825.num_links++;
@@ -514,7 +456,8 @@ static int sof_audio_probe(struct platform_device *pdev) 


	dai_links = sof_card_dai_links_create(&pdev->dev, ctx->amp_type,

					      ssp_codec, ssp_amp, dmic_be_num,

					      hdmi_num);

					      ctx->hdmi_num,

					      ctx->hdmi.idisp_codec);

	if (!dai_links)

		return -ENOMEM;
@@ -638,7 +581,7 @@ MODULE_AUTHOR("David Lin <ctlin0@nuvoton.com>"); 
MODULE_AUTHOR("Mac Chiang <mac.chiang@intel.com>");

MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");

MODULE_LICENSE("GPL");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_MAXIM_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_NUVOTON_COMMON);

MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_REALTEK_COMMON);