Unverified Commit a4203256 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: clarify Kconfig dependencies 



Since we've moved to the same flows for HDaudio and iDISP codecs, we
need to be more consistent about dependencies.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221027193540.259520-20-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 02785b89

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

+5 −5
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static bool hda_use_tplg_nhlt; 
module_param_named(sof_use_tplg_nhlt, hda_use_tplg_nhlt, bool, 0444);

MODULE_PARM_DESC(sof_use_tplg_nhlt, "SOF topology nhlt override");



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)



struct hda_pipe_params {

	u32 ch;
@@ -772,7 +772,7 @@ void hda_set_dai_drv_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *ops) 
				ops->drv[i].ops = &ipc3_ssp_dai_ops;

				continue;

			}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

			if (strstr(ops->drv[i].name, "iDisp") ||

			    strstr(ops->drv[i].name, "Analog") ||

			    strstr(ops->drv[i].name, "Digital"))
@@ -793,7 +793,7 @@ void hda_set_dai_drv_ops(struct snd_sof_dev *sdev, struct snd_sof_dsp_ops *ops) 
				ops->drv[i].ops = &ipc4_ssp_dai_ops;

				continue;

			}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

			if (strstr(ops->drv[i].name, "iDisp") ||

			    strstr(ops->drv[i].name, "Analog") ||

			    strstr(ops->drv[i].name, "Digital"))
@@ -911,7 +911,7 @@ struct snd_soc_dai_driver skl_dai[] = { 
		.channels_max = 4,

	},

},

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

{

	.name = "iDisp1 Pin",

	.playback = {
@@ -984,7 +984,7 @@ int hda_dsp_dais_suspend(struct snd_sof_dev *sdev) 
	 * Since the component suspend is called last, we can trap this corner case

	 * and force the DAIs to release their resources.

	 */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	int ret;



	ret = hda_dai_suspend(sof_to_bus(sdev));

sound/soc/sof/intel/hda.c

+2 −2
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static int check_nhlt_ssp_mclk_mask(struct snd_sof_dev *sdev, int ssp_num) 
	return intel_nhlt_ssp_mclk_mask(nhlt, ssp_num);

}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) || IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) || IS_ENABLED(CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE)



static const char *fixup_tplg_name(struct snd_sof_dev *sdev,

				   const char *sof_tplg_filename,
@@ -1222,7 +1222,7 @@ int hda_power_down_dsp(struct snd_sof_dev *sdev) 
	return hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);

}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

static void hda_generic_machine_select(struct snd_sof_dev *sdev,

				       struct snd_soc_acpi_mach **mach)

{