diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h
index 40d9f71eed..709c7acce9 100644
--- a/src/soc/intel/cannonlake/chip.h
+++ b/src/soc/intel/cannonlake/chip.h
@@ -337,6 +337,11 @@ struct soc_intel_cannonlake_config {
 	 */
 	uint8_t SerialIoDevMode[PchSerialIoIndexMAX];
 
+	enum {
+		SERIAL_IRQ_QUIET_MODE      = 0,
+		SERIAL_IRQ_CONTINUOUS_MODE = 1,
+	} SerialIrqConfigSirqMode;
+
 	/* GPIO SD card detect pin */
 	unsigned int sdcard_cd_gpio;
 
diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c
index e0a62cc0ac..24458b8564 100644
--- a/src/soc/intel/cannonlake/fsp_params.c
+++ b/src/soc/intel/cannonlake/fsp_params.c
@@ -361,6 +361,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
 
 	/* Unlock all GPIO pads */
 	tconfig->PchUnlockGpioPads = config->PchUnlockGpioPads;
+
+	/* Set correct Sirq mode based on config */
+	params->PchSirqMode = config->SerialIrqConfigSirqMode;
 }
 
 /* Mainboard GPIO Configuration */
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index 56fefa5c05..050b90af90 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -219,6 +219,8 @@ static void clock_gate_8254(const struct device *dev)
 
 void lpc_soc_init(struct device *dev)
 {
+	const config_t *config = dev->chip_info;
+
 	/* Legacy initialization */
 	isa_dma_init();
 	pch_misc_init();
@@ -227,7 +229,7 @@ void lpc_soc_init(struct device *dev)
 	lpc_enable_pci_clk_cntl();
 
 	/* Set LPC Serial IRQ mode */
-	if (CONFIG(SERIRQ_CONTINUOUS_MODE))
+	if (config->SerialIrqConfigSirqMode)
 		lpc_set_serirq_mode(SERIRQ_CONTINUOUS);
 	else
 		lpc_set_serirq_mode(SERIRQ_QUIET);