diff --git a/sound/soc/sof/intel/hda-loader-skl.c b/sound/soc/sof/intel/hda-loader-skl.c
index 4edd78f9f57c24..3a94aa378567f5 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;
 
@@ -328,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) {
@@ -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;
 
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),