Unverified Commit 31ba0c07 authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: Modify existing helper to disable WAKEEN 



Modify hda_codec_jack_wake_enable() to also support disable WAKEEN.
In addition, this patch also moves the WAKEEN disablement call out of
hda_codec_jack_check() into hda_codec_jack_wake_enable().

This is a preparation for next patch.

No functional change intended.

Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Link: https://lore.kernel.org/r/20210112181128.1229827-2-kai.heng.feng@canonical.com


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

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

+7 −9
Original line number Diff line number Diff line
@@ -63,16 +63,18 @@ static int hda_codec_load_module(struct hda_codec *codec) 
}



/* enable controller wake up event for all codecs with jack connectors */

void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev)

void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable)

{

	struct hda_bus *hbus = sof_to_hbus(sdev);

	struct hdac_bus *bus = sof_to_bus(sdev);

	struct hda_codec *codec;

	unsigned int mask = 0;



	if (enable) {

		list_for_each_codec(codec, hbus)

			if (codec->jacktbl.used)

				mask |= BIT(codec->core.addr);

	}



	snd_hdac_chip_updatew(bus, WAKEEN, STATESTS_INT_MASK, mask);

}
@@ -81,12 +83,8 @@ void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) 
void hda_codec_jack_check(struct snd_sof_dev *sdev)

{

	struct hda_bus *hbus = sof_to_hbus(sdev);

	struct hdac_bus *bus = sof_to_bus(sdev);

	struct hda_codec *codec;



	/* disable controller Wake Up event*/

	snd_hdac_chip_updatew(bus, WAKEEN, STATESTS_INT_MASK, 0);



	list_for_each_codec(codec, hbus)

		/*

		 * Wake up all jack-detecting codecs regardless whether an event
@@ -96,7 +94,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) 
			pm_request_resume(&codec->core.dev);

}

#else

void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {}

void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable) {}

void hda_codec_jack_check(struct snd_sof_dev *sdev) {}

#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */

EXPORT_SYMBOL_NS(hda_codec_jack_wake_enable, SND_SOC_SOF_HDA_AUDIO_CODEC);

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

+4 −2
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) 


#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	if (runtime_suspend)

		hda_codec_jack_wake_enable(sdev);

		hda_codec_jack_wake_enable(sdev, true);



	/* power down all hda link */

	snd_hdac_ext_bus_link_power_down_all(bus);
@@ -683,8 +683,10 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 


#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* check jack status */

	if (runtime_resume)

	if (runtime_resume) {

		hda_codec_jack_wake_enable(sdev, false);

		hda_codec_jack_check(sdev);

	}



	/* turn off the links that were off before suspend */

	list_for_each_entry(hlink, &bus->hlink_list, list) {

sound/soc/sof/intel/hda.h

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev); 
 */

void hda_codec_probe_bus(struct snd_sof_dev *sdev,

			 bool hda_codec_use_common_hdmi);

void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev);

void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable);

void hda_codec_jack_check(struct snd_sof_dev *sdev);



#endif /* CONFIG_SND_SOC_SOF_HDA */