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

ASoC: SOF: Intel: hda-dsp: clarify dependencies on SND_SOC_SOF_HDA 



IS_ENABLED is not always in the right places, the codec parts depend
on SND_SOC_SOF_HDAUDIO_CODEC

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-15-pierre-louis.bossart@linux.intel.com


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

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

+1 −3
Original line number Diff line number Diff line
@@ -635,9 +635,9 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) 
	if (ret < 0)

		return ret;



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	hda_codec_jack_wake_enable(sdev, runtime_suspend);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* power down all hda link */

	snd_hdac_ext_bus_link_power_down_all(bus);

#endif
@@ -698,14 +698,12 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 
		goto cleanup;

	}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* check jack status */

	if (runtime_resume) {

		hda_codec_jack_wake_enable(sdev, false);

		if (sdev->system_suspend_target == SOF_SUSPEND_NONE)

			hda_codec_jack_check(sdev);

	}

#endif



	/* enable ppcap interrupt */

	hda_dsp_ctrl_ppcap_enable(sdev, true);