From 470e20aabce16d4456f74f942dd104c7196b9cba Mon Sep 17 00:00:00 2001 From: Zhu Yingjiang Date: Mon, 1 Apr 2019 17:12:09 +0800 Subject: [PATCH 1/2] ASoc:SOF:skl make ROM init timeout skl specific make ROM init timeout platform specific, change from define to platform structure assigned. Signed-off-by: Zhu Yingjiang --- sound/soc/sof/intel/hda-loader-skl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda-loader-skl.c b/sound/soc/sof/intel/hda-loader-skl.c index 4edd78f9f57c24..4924435a92360d 100644 --- a/sound/soc/sof/intel/hda-loader-skl.c +++ b/sound/soc/sof/intel/hda-loader-skl.c @@ -305,6 +305,8 @@ static void cl_cleanup_skl(struct snd_sof_dev *sdev) static int cl_dsp_init_skl(struct snd_sof_dev *sdev) { + struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata; + const struct sof_intel_dsp_desc *chip = hda->desc; unsigned int sts; int ret; @@ -359,7 +361,8 @@ static int cl_dsp_init_skl(struct snd_sof_dev *sdev) ((sts & HDA_DSP_ROM_STS_MASK) == HDA_DSP_ROM_INIT), HDA_DSP_REG_POLL_INTERVAL_US, - HDA_DSP_INIT_TIMEOUT_US); + chip->rom_init_timeout * + USEC_PER_MSEC); if (ret < 0) goto err; From 7b223da42e573b4c43c615a8230f8c90dee99560 Mon Sep 17 00:00:00 2001 From: Zhu Yingjiang Date: Fri, 15 Mar 2019 19:59:19 +0800 Subject: [PATCH 2/2] ASoC:SOF:skl fix some comments error fix two comments, Apollolake should be Skylake Signed-off-by: Zhu Yingjiang --- sound/soc/sof/intel/hda-loader-skl.c | 2 +- sound/soc/sof/intel/skl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-loader-skl.c b/sound/soc/sof/intel/hda-loader-skl.c index 4924435a92360d..3a94aa378567f5 100644 --- a/sound/soc/sof/intel/hda-loader-skl.c +++ b/sound/soc/sof/intel/hda-loader-skl.c @@ -330,7 +330,7 @@ static int cl_dsp_init_skl(struct snd_sof_dev *sdev) } else { /* * if not enabled, power down it first and - * then powerup and runthe core. + * then powerup and run the core. */ ret = hda_dsp_core_reset_power_down(sdev, HDA_DSP_CORE_MASK(0)); if (ret < 0) { diff --git a/sound/soc/sof/intel/skl.c b/sound/soc/sof/intel/skl.c index 1918297bae420b..9d607ead7b6681 100644 --- a/sound/soc/sof/intel/skl.c +++ b/sound/soc/sof/intel/skl.c @@ -91,7 +91,7 @@ const struct snd_sof_dsp_ops sof_skl_ops = { EXPORT_SYMBOL(sof_skl_ops); const struct sof_intel_dsp_desc skl_chip_info = { - /* Apollolake */ + /* Skylake */ .cores_num = 2, .init_core_mask = 1, .cores_mask = HDA_DSP_CORE_MASK(0) | HDA_DSP_CORE_MASK(1),