ASoC: Intel: bxt_rt298: common hdmi codec support (7d2ae583) · Commits · 戴 / test

sound/soc/intel/boards/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o
		snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o
		snd-soc-sst-broadwell-objs := broadwell.o
		snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o hda_dsp_common.o
		snd-soc-sst-bxt-rt298-objs := bxt_rt298.o
		snd-soc-sst-bxt-rt298-objs := bxt_rt298.o hda_dsp_common.o
		snd-soc-sst-glk-rt5682_max98357a-objs := glk_rt5682_max98357a.o hda_dsp_common.o
		snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o
		snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o

+11 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#include <sound/pcm_params.h>
		#include "../../codecs/hdac_hdmi.h"
		#include "../../codecs/rt298.h"
		#include "hda_dsp_common.h"

		/* Headset jack detection DAPM pins */
		static struct snd_soc_jack broxton_headset;
		@@ -31,6 +32,7 @@ struct bxt_hdmi_pcm {

		struct bxt_rt286_private {
		struct list_head hdmi_pcm_list;
		bool common_hdmi_codec_drv;
		};

		enum {
		@@ -527,6 +529,13 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
		int err, i = 0;
		char jack_name[NAME_SIZE];

		pcm = list_first_entry(&ctx->hdmi_pcm_list, struct bxt_hdmi_pcm,
		head);
		component = pcm->codec_dai->component;

		if (ctx->common_hdmi_codec_drv)
		return hda_dsp_hdmi_build_controls(card, component);

		list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
		component = pcm->codec_dai->component;
		snprintf(jack_name, sizeof(jack_name),
		@@ -626,6 +635,8 @@ static int broxton_audio_probe(struct platform_device *pdev)
		if (ret)
		return ret;

		ctx->common_hdmi_codec_drv = mach->mach_params.common_hdmi_codec_drv;

		return devm_snd_soc_register_card(&pdev->dev, card);
		}