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

Unverified Commit 257aaceb authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: intel: kbl_da7219_max98357: replace codec to component 



Now we can replace Codec to Component. Let's do it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ea954fbc

sound/soc/intel/boards/kbl_da7219_max98357a.c

+6 −6
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int kabylake_ssp_fixup(struct snd_soc_pcm_runtime *rtd, 
static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd)

{

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

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_component *component = rtd->codec_dai->component;

	struct snd_soc_jack *jack;

	int ret;
@@ -191,7 +191,7 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) 
	snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP);

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

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

	da7219_aad_jack_det(codec, &ctx->kabylake_headset);

	da7219_aad_jack_det(component, &ctx->kabylake_headset);



	ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");

	if (ret)
@@ -522,12 +522,12 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) 
{

	struct kbl_codec_private *ctx = snd_soc_card_get_drvdata(card);

	struct kbl_hdmi_pcm *pcm;

	struct snd_soc_codec *codec = NULL;

	struct snd_soc_component *component = NULL;

	int err, i = 0;

	char jack_name[NAME_SIZE];



	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {

		codec = pcm->codec_dai->codec;

		component = pcm->codec_dai->component;

		snprintf(jack_name, sizeof(jack_name),

			"HDMI/DP, pcm=%d Jack", pcm->device);

		err = snd_soc_card_jack_new(card, jack_name,
@@ -546,10 +546,10 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) 


	}



	if (!codec)

	if (!component)

		return -EINVAL;



	return hdac_hdmi_jack_port_init(codec, &card->dapm);

	return hdac_hdmi_jack_port_init(component, &card->dapm);

}



/* kabylake audio machine driver for SPT + DA7219 */