Skip to content

ASoC: SOF: remove dsp core power up from hda_resume #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Dec 12, 2018
Merged

ASoC: SOF: remove dsp core power up from hda_resume #406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions sound/soc/sof/intel/hda-dsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ static int hda_suspend(struct snd_sof_dev *sdev, int state)

static int hda_resume(struct snd_sof_dev *sdev)
{
const struct sof_intel_dsp_desc *chip = sdev->hda->desc;
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
struct hdac_bus *bus = sof_to_bus(sdev);
struct hdac_ext_link *hlink = NULL;
Expand Down Expand Up @@ -343,14 +342,6 @@ static int hda_resume(struct snd_sof_dev *sdev)
}
#endif

/* power up the DSP */
ret = hda_dsp_core_power_up(sdev, chip->cores_mask);
if (ret < 0) {
dev_err(sdev->dev,
"error: failed to power up core after resume\n");
return ret;
}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
/* turn off the links that were off before suspend */
list_for_each_entry(hlink, &bus->hlink_list, list) {
Expand Down Expand Up @@ -378,13 +369,13 @@ int hda_dsp_resume(struct snd_sof_dev *sdev)
return ret;
}

/* init hda controller and power dsp up */
/* init hda controller. DSP cores will be powered up during fw boot */
return hda_resume(sdev);
}

int hda_dsp_runtime_resume(struct snd_sof_dev *sdev)
{
/* init hda controller and power dsp up */
/* init hda controller. DSP cores will be powered up during fw boot */
return hda_resume(sdev);
}

Expand Down