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

ASoC: SOF: Intel: hda-ctrl: add codec wakeup helper 



Add new helper in hda-codec.c for a clean split between controller and
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-9-pierre-louis.bossart@linux.intel.com


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

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

+8 −0
Original line number Diff line number Diff line
@@ -278,6 +278,14 @@ void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev) 
}

EXPORT_SYMBOL_NS_GPL(hda_codec_rirb_status_clear, SND_SOC_SOF_HDA_AUDIO_CODEC);



void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status)

{

	struct hdac_bus *bus = sof_to_bus(sdev);



	snd_hdac_set_codec_wakeup(bus, status);

}

EXPORT_SYMBOL_NS_GPL(hda_codec_set_codec_wakeup, SND_SOC_SOF_HDA_AUDIO_CODEC);



#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC) && IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)

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

+4 −6
Original line number Diff line number Diff line
@@ -185,9 +185,8 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev) 
	if (bus->chip_init)

		return 0;



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	snd_hdac_set_codec_wakeup(bus, true);

#endif

	hda_codec_set_codec_wakeup(sdev, true);



	hda_dsp_ctrl_misc_clock_gating(sdev, false);



	/* reset HDA controller */
@@ -245,9 +244,8 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev) 


err:

	hda_dsp_ctrl_misc_clock_gating(sdev, true);

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	snd_hdac_set_codec_wakeup(bus, false);

#endif



	hda_codec_set_codec_wakeup(sdev, false);



	return ret;

}

sound/soc/sof/intel/hda.h

+2 −0
Original line number Diff line number Diff line
@@ -721,6 +721,7 @@ void hda_codec_check_for_state_change(struct snd_sof_dev *sdev); 
void hda_codec_init_cmd_io(struct snd_sof_dev *sdev);

void hda_codec_detect_mask(struct snd_sof_dev *sdev);

void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev);

void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status);



#else
@@ -731,6 +732,7 @@ static inline void hda_codec_check_for_state_change(struct snd_sof_dev *sdev) { 
static inline void hda_codec_init_cmd_io(struct snd_sof_dev *sdev) { }

static inline void hda_codec_detect_mask(struct snd_sof_dev *sdev) { }

static inline void hda_codec_rirb_status_clear(struct snd_sof_dev *sdev) { }

static inline void hda_codec_set_codec_wakeup(struct snd_sof_dev *sdev, bool status) { }



#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */