Index: head/sys/dev/uart/uart_bus.h
===================================================================
--- head/sys/dev/uart/uart_bus.h
+++ head/sys/dev/uart/uart_bus.h
@@ -57,7 +57,8 @@
 #define	UART_IOCTL_BAUD		4
 
 /* UART quirk flags */
-#define	UART_F_BUSY_DETECT	0x1
+#define	UART_F_BUSY_DETECT		0x1
+#define	UART_F_IGNORE_SPCR_REGSHFT	0x2
 
 /*
  * UART class & instance (=softc)
Index: head/sys/dev/uart/uart_cpu_arm64.c
===================================================================
--- head/sys/dev/uart/uart_cpu_arm64.c
+++ head/sys/dev/uart/uart_cpu_arm64.c
@@ -153,6 +153,11 @@
 	*shiftp = spcr->SerialPort.AccessWidth - 1;
 	*iowidthp = spcr->SerialPort.BitWidth / 8;
 
+	if ((cd->cd_quirks & UART_F_IGNORE_SPCR_REGSHFT) ==
+	    UART_F_IGNORE_SPCR_REGSHFT) {
+		*shiftp = cd->cd_regshft;
+	}
+
 out:
 	acpi_unmap_table(spcr);
 	return (err);
Index: head/sys/dev/uart/uart_dev_pl011.c
===================================================================
--- head/sys/dev/uart/uart_dev_pl011.c
+++ head/sys/dev/uart/uart_dev_pl011.c
@@ -342,8 +342,9 @@
 
 #ifdef DEV_ACPI
 static struct acpi_uart_compat_data acpi_compat_data[] = {
-	{"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_PL011, 2, 0, 0, 0, "uart plo11"},
-	{"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC, 2, 0, 0, 0, "uart plo11"},
+	{"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_PL011, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"},
+	{"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"},
+	{"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_32BIT, 2, 0, 0, UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"},
 	{NULL, NULL, 0, 0, 0, 0, 0, NULL},
 };
 UART_ACPI_CLASS_AND_DEVICE(acpi_compat_data);