diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
commit | 5403e7c67e6625df392da2438d02c70442fd1952 (patch) | |
tree | 988c327386789b1b9fefe7ba1cebed2c7a387b32 /ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch | |
parent | b1e22a960e2a6f39797e7d2022994df2176ad1e9 (diff) | |
parent | 0310b312a7e5dffcdf24ae835ed732f7a6a9c471 (diff) | |
download | kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.gz kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.xz kernel-5403e7c67e6625df392da2438d02c70442fd1952.zip |
blindly merge master, no adjustments to the new world order yet
Diffstat (limited to 'ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch')
-rw-r--r-- | ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch b/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch deleted file mode 100644 index 697d76e13..000000000 --- a/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1e494dc5f3140005ff1f17bc06c0c16d6d50d580 Mon Sep 17 00:00:00 2001 -From: Mark Salter <msalter@redhat.com> -Date: Thu, 19 Apr 2018 23:29:47 -0400 -Subject: [PATCH] ACPI / scan: Fix regression related to X-Gene UARTs - -Commit e361d1f85855 ("ACPI / scan: Fix enumeration for special UART -devices") caused a regression with some X-Gene based platforms (Mustang -and M400) with invalid DSDT. The DSDT makes it appear that the UART -device is also a slave device attached to itself. With the above commit -the UART won't be enumerated by ACPI scan (slave serial devices shouldn't -be). So check for X-Gene UART device and skip slace device check on it. - -Signed-off-by: Mark Salter <msalter@redhat.com> ---- - drivers/acpi/scan.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index e1b6231cfa1c..542dafac4306 100644 ---- a/drivers/acpi/scan.c -+++ b/drivers/acpi/scan.c -@@ -1567,6 +1567,14 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) - if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) - return false; - -+ /* -+ * Firmware on some arm64 X-Gene platforms will make the UART -+ * device appear as both a UART and a slave of that UART. Just -+ * bail out here for X-Gene UARTs. -+ */ -+ if (!strcmp(acpi_device_hid(device), "APMC0D08")) -+ return false; -+ - INIT_LIST_HEAD(&resource_list); - acpi_dev_get_resources(device, &resource_list, - acpi_check_serial_bus_slave, --- -2.17.1 - |