diff --git a/sys/arm/xilinx/uart_dev_cdnc.c b/sys/arm/xilinx/uart_dev_cdnc.c
index 388f76031a6c..cd7f0d7d0807 100644
--- a/sys/arm/xilinx/uart_dev_cdnc.c
+++ b/sys/arm/xilinx/uart_dev_cdnc.c
@@ -711,6 +711,8 @@ static struct uart_class uart_cdnc_class = {
 
 static struct ofw_compat_data compat_data[] = {
 	{"cadence,uart",	(uintptr_t)&uart_cdnc_class},
+	{"cdns,uart-r1p12",	(uintptr_t)&uart_cdnc_class},
+	{"xlnx,xuartps",	(uintptr_t)&uart_cdnc_class},
 	{NULL,			(uintptr_t)NULL},
 };
 UART_FDT_CLASS_AND_DEVICE(compat_data);
diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 0ef2451f7cf5..131f39b69794 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -106,6 +106,7 @@ options 	SOC_CAVM_THUNDERX
 options 	SOC_HISI_HI6220
 options 	SOC_BRCM_BCM2837
 options 	SOC_ROCKCHIP_RK3328
+options 	SOC_XILINX_ZYNQ
 
 # Annapurna Alpine drivers
 device		al_ccu			# Alpine Cache Coherency Unit
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 9d32c8b27e15..8fa9a06cc7ac 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -87,6 +87,7 @@ arm/broadcom/bcm2835/bcm2835_wdog.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2836.c			optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt soc_brcm_bcm2837
 arm/mv/armada38x/armada38x_rtc.c		optional mv_rtc fdt
+arm/xilinx/uart_dev_cdnc.c			optional uart soc_xilinx_zynq
 arm64/acpica/acpi_machdep.c	optional	acpi
 arm64/acpica/OsdEnvironment.c	optional	acpi
 arm64/acpica/acpi_wakeup.c	optional	acpi
diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64
index 02ed70506fca..8abe09fae999 100644
--- a/sys/conf/options.arm64
+++ b/sys/conf/options.arm64
@@ -20,3 +20,4 @@ SOC_BRCM_BCM2837		opt_soc.h
 SOC_CAVM_THUNDERX		opt_soc.h
 SOC_HISI_HI6220			opt_soc.h
 SOC_ROCKCHIP_RK3328		opt_soc.h
+SOC_XILINX_ZYNQ			opt_soc.h