The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f9ccec823a9f759ad6360c2a0c6336a3e2a6188a
commit f9ccec823a9f759ad6360c2a0c6336a3e2a6188a
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2022-12-19 13:42:44 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2022-12-22 14:24:40 +0000
Add support for the new Arm Generic UART _HID
Historically the ACPI _HID for both the Arm PL011 and Generic UARTs
was ARMH0011. In the Arm Base Boot Requirements 2.0 the Generic UART
_HID is changed to ARMHB000. Use this new value in the PL011 driver
where we support both UART types.
This has been observed in some recent EDK2 builds.
Sponsored by: Arm Ltd
---
sys/dev/uart/uart_dev_pl011.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c
index 822283369075..ae1536bc4300 100644
--- a/sys/dev/uart/uart_dev_pl011.c
+++ b/sys/dev/uart/uart_dev_pl011.c
@@ -341,8 +341,8 @@ UART_FDT_CLASS_AND_DEVICE(fdt_compat_data);
#ifdef DEV_ACPI
static struct acpi_uart_compat_data acpi_compat_data[] = {
{"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"},
+ {"ARMHB000", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC, 2, 0, 0,
UART_F_IGNORE_SPCR_REGSHFT, "uart pl011"},
+ {"ARMHB000", &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);
