1 |
From 706e3aa6b7f08ad2616f436c4a93300b048d808d Mon Sep 17 00:00:00 2001 |
2 |
From: Hans de Goede <hdegoede@redhat.com> |
3 |
Date: Mon, 27 Aug 2018 09:45:44 +0200 |
4 |
Subject: [PATCH 061/145] ACPI / LPSS: Add alternative ACPI HIDs for Cherry |
5 |
Trail DMA controllers |
6 |
|
7 |
[ Upstream commit 240714061c58e6b1abfb3322398a7634151c06cb ] |
8 |
|
9 |
Bay and Cherry Trail DSTDs represent a different set of devices depending |
10 |
on which OS the device think it is booting. One set of decices for Windows |
11 |
and another set of devices for Android which targets the Android-x86 Linux |
12 |
kernel fork (which e.g. used to have its own display driver instead of |
13 |
using the i915 driver). |
14 |
|
15 |
Which set of devices we are actually going to get is out of our control, |
16 |
this is controlled by the ACPI OSID variable, which gets either set through |
17 |
an EFI setup option, or sometimes is autodetected. So we need to support |
18 |
both. |
19 |
|
20 |
This commit adds support for the 80862286 and 808622C0 ACPI HIDs which we |
21 |
get for the first resp. second DMA controller on Cherry Trail devices when |
22 |
OSID is set to Android. |
23 |
|
24 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
25 |
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
26 |
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
27 |
Signed-off-by: Sasha Levin <sashal@kernel.org> |
28 |
--- |
29 |
drivers/acpi/acpi_lpss.c | 2 ++ |
30 |
1 file changed, 2 insertions(+) |
31 |
|
32 |
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c |
33 |
index bf64cfa30feb..969bf8d515c0 100644 |
34 |
--- a/drivers/acpi/acpi_lpss.c |
35 |
+++ b/drivers/acpi/acpi_lpss.c |
36 |
@@ -327,9 +327,11 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { |
37 |
{ "INT33FC", }, |
38 |
|
39 |
/* Braswell LPSS devices */ |
40 |
+ { "80862286", LPSS_ADDR(lpss_dma_desc) }, |
41 |
{ "80862288", LPSS_ADDR(bsw_pwm_dev_desc) }, |
42 |
{ "8086228A", LPSS_ADDR(bsw_uart_dev_desc) }, |
43 |
{ "8086228E", LPSS_ADDR(bsw_spi_dev_desc) }, |
44 |
+ { "808622C0", LPSS_ADDR(lpss_dma_desc) }, |
45 |
{ "808622C1", LPSS_ADDR(bsw_i2c_dev_desc) }, |
46 |
|
47 |
/* Broadwell LPSS devices */ |
48 |
-- |
49 |
2.19.1 |
50 |
|