@@ -27,6 +27,7 @@
#include <asm/device.h>
#include <xen/mm.h>
#include <xen/vmap.h>
+#include <xen/acpi.h>
#include <asm/pl011-uart.h>
#include <asm/io.h>
@@ -308,6 +309,42 @@ DT_DEVICE_START(pl011, "PL011 UART", DEVICE_SERIAL)
.init = pl011_dt_uart_init,
DT_DEVICE_END
+#ifdef CONFIG_ACPI
+static int __init pl011_acpi_uart_init(const void *data)
+{
+ acpi_status status;
+ struct acpi_table_spcr *spcr = NULL;
+ int res;
+
+ status = acpi_get_table(ACPI_SIG_SPCR, 0,
+ (struct acpi_table_header **)&spcr);
+
+ if ( ACPI_FAILURE(status) )
+ {
+ printk("pl011: Failed to get SPCR table\n");
+ return -EINVAL;
+ }
+
+ /* trigger/polarity information is not available in spcr */
+ irq_set_type(spcr->interrupt, IRQ_TYPE_EDGE_BOTH);
+
+ res = pl011_uart_init(spcr->interrupt, spcr->serial_port.address,
+ PAGE_SIZE);
+ if ( res < 0 )
+ {
+ printk("pl011: Unable to initialize\n");
+ return res;
+ }
+
+ return 0;
+}
+
+ACPI_DEVICE_START(apl011, "PL011 UART", DEVICE_SERIAL)
+ .class_type = ACPI_SPCR_TYPE_PL011,
+ .init = pl011_acpi_uart_init,
+ACPI_DEVICE_END
+#endif
+
/*
* Local variables:
* mode: C
@@ -815,6 +815,15 @@ struct acpi_table_spcr {
#define ACPI_SPCR_DO_NOT_DISABLE (1)
+/* SPCR Interface type */
+#define ACPI_SPCR_TYPE_16550 0
+#define ACPI_SPCR_TYPE_16550_SUB 0x1
+#define ACPI_SPCR_TYPE_PL011 0x3
+#define ACPI_SPCR_TYPE_SBSA_32 0xd
+#define ACPI_SPCR_TYPE_SBSA 0xe
+#define ACPI_SPCR_TYPE_DCC 0xf
+#define ACPI_SPCR_TYPE_BCM2835 0x10
+
/*******************************************************************************
*
* SPMI - Server Platform Management Interface table