Unverified Commit 8da936e1 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: HDA: two cleanups 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

One removal of a non-existent Kconfig initialization and one
correction to enable SoundWire link when no HDaudio external codec is
detected. This will generate more information and help resolve cases
where the ACPI information is incorrect.
parents 484ede9b 3bd45b8d

sound/soc/sof/intel/hda-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static bool hda_always_enable_dmi_l1; 
module_param_named(always_enable_dmi_l1, hda_always_enable_dmi_l1, bool, 0444);

MODULE_PARM_DESC(always_enable_dmi_l1, "SOF HDA always enable DMI l1");



static bool hda_disable_rewinds = IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_DISABLE_REWINDS);

static bool hda_disable_rewinds;

module_param_named(disable_rewinds, hda_disable_rewinds, bool, 0444);

MODULE_PARM_DESC(disable_rewinds, "SOF HDA disable rewinds");

sound/soc/sof/intel/hda.c

+11 −1
Original line number Diff line number Diff line
@@ -1368,12 +1368,22 @@ static void hda_generic_machine_select(struct snd_sof_dev *sdev, 
			hda_mach->mach_params.dmic_num = dmic_num;

			pdata->tplg_filename = tplg_filename;



			if (codec_num == 2) {

			if (codec_num == 2 ||

			    (codec_num == 1 && !HDA_IDISP_CODEC(bus->codec_mask))) {

				/*

				 * Prevent SoundWire links from starting when an external

				 * HDaudio codec is used

				 */

				hda_mach->mach_params.link_mask = 0;

			} else {

				/*

				 * Allow SoundWire links to start when no external HDaudio codec

				 * was detected. This will not create a SoundWire card but

				 * will help detect if any SoundWire codec reports as ATTACHED.

				 */

				struct sof_intel_hda_dev *hdev = sdev->pdata->hw_pdata;



				hda_mach->mach_params.link_mask = hdev->info.link_mask;

			}



			*mach = hda_mach;