summaryrefslogtreecommitdiffstats
path: root/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2018-10-23 09:55:11 -0400
committerJeremy Cline <jcline@redhat.com>2018-10-23 14:38:10 -0400
commit35809dfd7be321e9e16516f4314a1699df5bbd39 (patch)
tree2db921e118029f45d0582bd5bc945d671eef0534 /ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
parent764628643cfcb53d59edf15adf7f32508a220c0e (diff)
downloadkernel-35809dfd7be321e9e16516f4314a1699df5bbd39.tar.gz
kernel-35809dfd7be321e9e16516f4314a1699df5bbd39.tar.xz
kernel-35809dfd7be321e9e16516f4314a1699df5bbd39.zip
Rebase to v4.19.0
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.patch23
1 files changed, 9 insertions, 14 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
index 56baf5ec6..697d76e13 100644
--- a/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
+++ b/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
@@ -1,15 +1,7 @@
-From patchwork Fri Apr 20 03:29:47 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: ACPI / scan: Fix regression related to X-Gene UARTs
+From 1e494dc5f3140005ff1f17bc06c0c16d6d50d580 Mon Sep 17 00:00:00 2001
From: Mark Salter <msalter@redhat.com>
-X-Patchwork-Id: 10351797
-Message-Id: <20180420032947.23023-1-msalter@redhat.com>
-To: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis.oss@gmail.com>
-Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
- linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
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
@@ -24,12 +16,12 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
1 file changed, 8 insertions(+)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index cc234e6a6297..1dcdd0122862 100644
+index e1b6231cfa1c..542dafac4306 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
-@@ -1551,6 +1551,14 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
- fwnode_property_present(&device->fwnode, "baud")))
- return true;
+@@ -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
@@ -42,3 +34,6 @@ index cc234e6a6297..1dcdd0122862 100644
INIT_LIST_HEAD(&resource_list);
acpi_dev_get_resources(device, &resource_list,
acpi_check_serial_bus_slave,
+--
+2.17.1
+