Unverified Commit 9da0ed4a authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: don't check number of sdw links when set 

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

Currently, we assume that the PCH DMIC pins are pin-muxed with SoundWire
links. However, we do see a HW design that use PCH DMIC along with 3
SoundWire links. Remove the check and add warning to let users know that
SoundWire MIC and PCH DMIC are both present and they could overwrite it
with kernel params.
parents 769c1b79 4bcef04c

sound/soc/intel/boards/sof_sdw.c

+7 −0
Original line number Diff line number Diff line
@@ -803,7 +803,9 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
			      int *be_id, struct snd_soc_codec_conf **codec_conf)

{

	struct device *dev = card->dev;

	struct snd_soc_acpi_mach *mach = dev_get_platdata(card->dev);

	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);

	struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;

	struct intel_mc_ctx *intel_ctx = (struct intel_mc_ctx *)ctx->private;

	struct asoc_sdw_endpoint *sof_end;

	int stream;
@@ -900,6 +902,11 @@ static int create_sdw_dailink(struct snd_soc_card *card, 


			codecs[j].name = sof_end->codec_name;

			codecs[j].dai_name = sof_end->dai_info->dai_name;

			if (sof_end->dai_info->dai_type == SOC_SDW_DAI_TYPE_MIC &&

			    mach_params->dmic_num > 0) {

				dev_warn(dev,

					 "Both SDW DMIC and PCH DMIC are present, if incorrect, please set kernel params snd_sof_intel_hda_generic dmic_num=0 to disable PCH DMIC\n");

			}

			j++;

		}

sound/soc/sof/intel/hda.c

+2 −16
Original line number Diff line number Diff line
@@ -1312,22 +1312,8 @@ struct snd_soc_acpi_mach *hda_machine_select(struct snd_sof_dev *sdev) 
		/* report to machine driver if any DMICs are found */

		mach->mach_params.dmic_num = check_dmic_num(sdev);



		if (sdw_mach_found) {

			/*

			 * DMICs use up to 4 pins and are typically pin-muxed with SoundWire

			 * link 2 and 3, or link 1 and 2, thus we only try to enable dmics

			 * if all conditions are true:

			 * a) 2 or fewer links are used by SoundWire

			 * b) the NHLT table reports the presence of microphones

			 */

			if (hweight_long(mach->link_mask) <= 2)

				dmic_fixup = true;

			else

				mach->mach_params.dmic_num = 0;

		} else {

			if (mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER)

		if (sdw_mach_found || mach->tplg_quirk_mask & SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER)

			dmic_fixup = true;

		}



		if (tplg_fixup &&

		    dmic_fixup &&