Page MenuHomeFreeBSD
Files F147913934

D47947.1784772300.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D47947.1784772300.diff
View Options

diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.h
@@ -56,7 +56,6 @@
/* UART quirk flags */
#define UART_F_BUSY_DETECT 0x1
-#define UART_F_IGNORE_SPCR_REGSHFT 0x2
/*
* UART class & instance (=softc)
diff --git a/sys/dev/uart/uart_cpu_acpi.c b/sys/dev/uart/uart_cpu_acpi.c
--- a/sys/dev/uart/uart_cpu_acpi.c
+++ b/sys/dev/uart/uart_cpu_acpi.c
@@ -221,12 +221,6 @@
di->pci_info.device = spcr->PciDeviceId;
}
- /* Apply device tweaks. */
- if ((cd->cd_quirks & UART_F_IGNORE_SPCR_REGSHFT) ==
- UART_F_IGNORE_SPCR_REGSHFT) {
- di->bas.regshft = cd->cd_regshft;
- }
-
/* Create a bus space handle. */
error = bus_space_map(di->bas.bst, spcr->SerialPort.Address,
uart_getrange(class), 0, &di->bas.bsh);
@@ -296,12 +290,6 @@
/* XXX: Find the correct value */
di->baudrate = 115200;
- /* Apply device tweaks. */
- if ((cd->cd_quirks & UART_F_IGNORE_SPCR_REGSHFT) ==
- UART_F_IGNORE_SPCR_REGSHFT) {
- di->bas.regshft = cd->cd_regshft;
- }
-
/* Create a bus space handle. */
error = bus_space_map(di->bas.bst, base_address->Address,
uart_getrange(class), 0, &di->bas.bsh);
diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c
--- a/sys/dev/uart/uart_dev_pl011.c
+++ b/sys/dev/uart/uart_dev_pl011.c
@@ -377,7 +377,8 @@
.uc_ops = &uart_pl011_ops,
.uc_range = 0x48,
.uc_rclk = 0,
- .uc_rshift = 2
+ .uc_rshift = 2,
+ .uc_regiowidth = 4,
};
UART_CLASS(uart_pl011_class);
@@ -391,9 +392,9 @@
#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"},
- {"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"},
+ {"ARMH0011", &uart_pl011_class, ACPI_DBG2_ARM_PL011, 2, 0, 0, 0, "uart pl011"},
+ {"ARMHB000", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_GENERIC, 2, 0, 0, 0, "uart pl011"},
+ {"ARMHB000", &uart_pl011_class, ACPI_DBG2_ARM_SBSA_32BIT, 2, 0, 0, 0, "uart pl011"},
{NULL, NULL, 0, 0, 0, 0, 0, NULL},
};
UART_ACPI_CLASS_AND_DEVICE(acpi_compat_data);

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 2:05 AM (2 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29233896
Default Alt Text
D47947.1784772300.diff (2 KB)

Event Timeline