diff options
author | Mark Brown <broonie@kernel.org> | 2023-09-26 16:14:44 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-09-26 16:14:44 +0200 |
commit | af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a (patch) | |
tree | 5a71f1c4e3099d7cfe4c6f880e707173b6ec9cda /sound/soc/sof/intel | |
parent | ASoC: convert asoc_xxx() to snd_soc_xxx() (diff) | |
parent | ASoC: fsl-asoc-card: use integer type for fll_id and pll_id (diff) | |
download | wireguard-linux-af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a.tar.xz wireguard-linux-af08458988cb5dd4b4ff87cfb9da81c6d2c8ef7a.zip |
ASoC: Merge up fixes
For the benefit of CI.
Diffstat (limited to 'sound/soc/sof/intel')
-rw-r--r-- | sound/soc/sof/intel/mtl.c | 2 | ||||
-rw-r--r-- | sound/soc/sof/intel/mtl.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c index 0e91169c685e..254dbbeac1d0 100644 --- a/sound/soc/sof/intel/mtl.c +++ b/sound/soc/sof/intel/mtl.c @@ -463,7 +463,7 @@ int mtl_dsp_cl_init(struct snd_sof_dev *sdev, int stream_tag, bool imr_boot) /* step 3: wait for IPC DONE bit from ROM */ ret = snd_sof_dsp_read_poll_timeout(sdev, HDA_DSP_BAR, chip->ipc_ack, status, ((status & chip->ipc_ack_mask) == chip->ipc_ack_mask), - HDA_DSP_REG_POLL_INTERVAL_US, MTL_DSP_PURGE_TIMEOUT_US); + HDA_DSP_REG_POLL_INTERVAL_US, HDA_DSP_INIT_TIMEOUT_US); if (ret < 0) { if (hda->boot_iteration == HDA_FW_BOOT_ATTEMPTS) dev_err(sdev->dev, "timeout waiting for purge IPC done\n"); diff --git a/sound/soc/sof/intel/mtl.h b/sound/soc/sof/intel/mtl.h index 02181490f12a..95696b3d7c4c 100644 --- a/sound/soc/sof/intel/mtl.h +++ b/sound/soc/sof/intel/mtl.h @@ -62,7 +62,6 @@ #define MTL_DSP_IRQSTS_IPC BIT(0) #define MTL_DSP_IRQSTS_SDW BIT(6) -#define MTL_DSP_PURGE_TIMEOUT_US 20000000 /* 20s */ #define MTL_DSP_REG_POLL_INTERVAL_US 10 /* 10 us */ /* Memory windows */ |