diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig
index e80028ae80..6de9931de3 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -55,6 +55,8 @@ config SOC_INTEL_JASPERLAKE
 	select SOC_INTEL_COMMON_BLOCK_POWER_LIMIT
 	select SOC_INTEL_COMMON_BLOCK_SMM_IO_TRAP
 	select SOC_INTEL_COMMON_BLOCK_XHCI_ELOG
+	select SOC_INTEL_COMMON_FEATURE
+	select SOC_INTEL_COMMON_FEATURE_UART_DEVICES
 	select SOC_INTEL_COMMON_FSP_RESET
 	select SOC_INTEL_COMMON_PCH_CLIENT
 	select SOC_INTEL_COMMON_RESET
diff --git a/src/soc/intel/jasperlake/Makefile.mk b/src/soc/intel/jasperlake/Makefile.mk
index 1377fff9e0..6346f2d3d2 100644
--- a/src/soc/intel/jasperlake/Makefile.mk
+++ b/src/soc/intel/jasperlake/Makefile.mk
@@ -10,7 +10,6 @@ all-y += gspi.c
 all-y += i2c.c
 all-y += pmutil.c
 all-y += spi.c
-all-y += uart.c
 
 bootblock-y += bootblock/bootblock.c
 bootblock-y += bootblock/pch.c
@@ -47,7 +46,6 @@ smm-y += gpio.c
 smm-y += p2sb.c
 smm-y += pmutil.c
 smm-y += smihandler.c
-smm-y += uart.c
 smm-y += elog.c
 smm-y += xhci.c
 
diff --git a/src/soc/intel/jasperlake/include/soc/pci_devs.h b/src/soc/intel/jasperlake/include/soc/pci_devs.h
index e3276458bf..2d2b96a09e 100644
--- a/src/soc/intel/jasperlake/include/soc/pci_devs.h
+++ b/src/soc/intel/jasperlake/include/soc/pci_devs.h
@@ -193,4 +193,9 @@
 #define  PCH_DEV_GBE		_PCH_DEV(ESPI, 6)
 #define  PCH_DEV_TRACEHUB	_PCH_DEV(ESPI, 7)
 
+/* for common code */
+#define PCI_DEVFN_UART0		PCH_DEVFN_UART0
+#define PCI_DEVFN_UART1		PCH_DEVFN_UART1
+#define PCI_DEVFN_UART2		PCH_DEVFN_UART2
+
 #endif
diff --git a/src/soc/intel/jasperlake/uart.c b/src/soc/intel/jasperlake/uart.c
deleted file mode 100644
index 9946880263..0000000000
--- a/src/soc/intel/jasperlake/uart.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <commonlib/helpers.h>
-#include <soc/pci_devs.h>
-
-const unsigned int uart_devices[] = {
-	PCH_DEVFN_UART0,
-	PCH_DEVFN_UART1,
-	PCH_DEVFN_UART2,
-};
-
-const int uart_devices_size = ARRAY_SIZE(uart_devices);