| From foo@baz Sat Nov 10 11:24:34 PST 2018 |
| From: Hans de Goede <hdegoede@redhat.com> |
| Date: Mon, 27 Aug 2018 09:45:44 +0200 |
| Subject: ACPI / LPSS: Add alternative ACPI HIDs for Cherry Trail DMA controllers |
| |
| From: Hans de Goede <hdegoede@redhat.com> |
| |
| [ Upstream commit 240714061c58e6b1abfb3322398a7634151c06cb ] |
| |
| Bay and Cherry Trail DSTDs represent a different set of devices depending |
| on which OS the device think it is booting. One set of decices for Windows |
| and another set of devices for Android which targets the Android-x86 Linux |
| kernel fork (which e.g. used to have its own display driver instead of |
| using the i915 driver). |
| |
| Which set of devices we are actually going to get is out of our control, |
| this is controlled by the ACPI OSID variable, which gets either set through |
| an EFI setup option, or sometimes is autodetected. So we need to support |
| both. |
| |
| This commit adds support for the 80862286 and 808622C0 ACPI HIDs which we |
| get for the first resp. second DMA controller on Cherry Trail devices when |
| OSID is set to Android. |
| |
| Signed-off-by: Hans de Goede <hdegoede@redhat.com> |
| Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/acpi/acpi_lpss.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/acpi/acpi_lpss.c |
| +++ b/drivers/acpi/acpi_lpss.c |
| @@ -278,9 +278,11 @@ static const struct acpi_device_id acpi_ |
| { "INT33FC", }, |
| |
| /* Braswell LPSS devices */ |
| + { "80862286", LPSS_ADDR(lpss_dma_desc) }, |
| { "80862288", LPSS_ADDR(bsw_pwm_dev_desc) }, |
| { "8086228A", LPSS_ADDR(bsw_uart_dev_desc) }, |
| { "8086228E", LPSS_ADDR(bsw_spi_dev_desc) }, |
| + { "808622C0", LPSS_ADDR(lpss_dma_desc) }, |
| { "808622C1", LPSS_ADDR(bsw_i2c_dev_desc) }, |
| |
| /* Broadwell LPSS devices */ |