Unverified Commit 49b2597a authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: boards: updates for 6.12 - part 2 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Cleanup from Brent Lu and add HDMI-In capture supports from Balamurugan C.
parents f6e2e739 322706e1

include/sound/soc-acpi.h

+0 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg) 
 * @platform: string used for HDAudio codec support

 * @codec_mask: used for HDAudio support

 * @dmic_num: number of SoC- or chipset-attached PDM digital microphones

 * @common_hdmi_codec_drv: use commom HDAudio HDMI codec driver

 * @link_mask: SoundWire links enabled on the board

 * @links: array of SoundWire link _ADR descriptors, null terminated

 * @i2s_link_mask: I2S/TDM links enabled on the board
@@ -80,7 +79,6 @@ struct snd_soc_acpi_mach_params { 
	const char *platform;

	u32 codec_mask;

	u32 dmic_num;

	bool common_hdmi_codec_drv;

	u32 link_mask;

	const struct snd_soc_acpi_link_adr *links;

	u32 i2s_link_mask;

sound/soc/intel/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH 
	tristate "Skylake+ with HDA Codecs"

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_BOARD_HELPERS

	select SND_SOC_DMIC

	# SND_SOC_HDAC_HDA is already selected

	help

sound/soc/intel/boards/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ snd-soc-sof_cs42l42-y := sof_cs42l42.o 
snd-soc-sof_es8336-y := sof_es8336.o

snd-soc-sof_nau8825-y := sof_nau8825.o

snd-soc-sof_da7219-y := sof_da7219.o

snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o skl_hda_dsp_common.o

snd-soc-skl_hda_dsp-y := skl_hda_dsp_generic.o

snd-soc-ehl-rt5660-y := ehl_rt5660.o

snd-soc-sof-ssp-amp-y := sof_ssp_amp.o

snd-soc-sof-sdw-y += sof_sdw.o				\

sound/soc/intel/boards/ehl_rt5660.c

+1 −2
Original line number Diff line number Diff line
@@ -256,8 +256,7 @@ static void hdmi_link_init(struct snd_soc_card *card, 
{

	int i;



	if (mach->mach_params.common_hdmi_codec_drv &&

	    (mach->mach_params.codec_mask & IDISP_CODEC_MASK)) {

	if (mach->mach_params.codec_mask & IDISP_CODEC_MASK) {

		ctx->idisp_codec = true;

		return;

	}

sound/soc/intel/boards/skl_hda_dsp_common.c

deleted100644 → 0
+0 −156
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// Copyright(c) 2015-18 Intel Corporation.



/*

 * Common functions used in different Intel machine drivers

 */

#include <linux/module.h>

#include <linux/platform_device.h>

#include <sound/core.h>

#include <sound/jack.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

#include "skl_hda_dsp_common.h"



#include <sound/hda_codec.h>

#include "../../codecs/hdac_hda.h"



#define NAME_SIZE	32



int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device)

{

	struct skl_hda_private *ctx = snd_soc_card_get_drvdata(card);

	struct snd_soc_dai *dai;

	char dai_name[NAME_SIZE];



	snprintf(dai_name, sizeof(dai_name), "intel-hdmi-hifi%d",

		 ctx->dai_index);

	dai = snd_soc_card_get_codec_dai(card, dai_name);

	if (!dai)

		return -EINVAL;



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



	return 0;

}



SND_SOC_DAILINK_DEF(idisp1_cpu,

	DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")));

SND_SOC_DAILINK_DEF(idisp1_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi1")));



SND_SOC_DAILINK_DEF(idisp2_cpu,

	DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin")));

SND_SOC_DAILINK_DEF(idisp2_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi2")));



SND_SOC_DAILINK_DEF(idisp3_cpu,

	DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin")));

SND_SOC_DAILINK_DEF(idisp3_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi3")));



SND_SOC_DAILINK_DEF(analog_cpu,

	DAILINK_COMP_ARRAY(COMP_CPU("Analog CPU DAI")));

SND_SOC_DAILINK_DEF(analog_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D0", "Analog Codec DAI")));



SND_SOC_DAILINK_DEF(digital_cpu,

	DAILINK_COMP_ARRAY(COMP_CPU("Digital CPU DAI")));

SND_SOC_DAILINK_DEF(digital_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D0", "Digital Codec DAI")));



SND_SOC_DAILINK_DEF(dmic_pin,

	DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin")));



SND_SOC_DAILINK_DEF(dmic_codec,

	DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));



SND_SOC_DAILINK_DEF(dmic16k,

	DAILINK_COMP_ARRAY(COMP_CPU("DMIC16k Pin")));



SND_SOC_DAILINK_DEF(bt_offload_pin,

	DAILINK_COMP_ARRAY(COMP_CPU(""))); /* initialized in driver probe function */

SND_SOC_DAILINK_DEF(dummy,

	DAILINK_COMP_ARRAY(COMP_DUMMY()));



SND_SOC_DAILINK_DEF(platform,

	DAILINK_COMP_ARRAY(COMP_PLATFORM("0000:00:1f.3")));



/* skl_hda_digital audio interface glue - connects codec <--> CPU */

struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = {

	/* Back End DAI links */

	{

		.name = "iDisp1",

		.id = 1,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp1_cpu, idisp1_codec, platform),

	},

	{

		.name = "iDisp2",

		.id = 2,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp2_cpu, idisp2_codec, platform),

	},

	{

		.name = "iDisp3",

		.id = 3,

		.dpcm_playback = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(idisp3_cpu, idisp3_codec, platform),

	},

	{

		.name = "Analog Playback and Capture",

		.id = 4,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(analog_cpu, analog_codec, platform),

	},

	{

		.name = "Digital Playback and Capture",

		.id = 5,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(digital_cpu, digital_codec, platform),

	},

	{

		.name = "dmic01",

		.id = 6,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),

	},

	{

		.name = "dmic16k",

		.id = 7,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),

	},

	{

		.name = NULL, /* initialized in driver probe function */

		.id = 8,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(bt_offload_pin, dummy, platform),

	},

};



int skl_hda_hdmi_jack_init(struct snd_soc_card *card)

{

	struct skl_hda_private *ctx = snd_soc_card_get_drvdata(card);



	/* HDMI disabled, do not create controls */

	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);

}