| From 2b844ba79f4a114bd228ad6fee040ffd99a0963d Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> |
| Date: Fri, 17 Jan 2014 14:23:29 +0100 |
| Subject: Revert "ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs" |
| |
| From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> |
| |
| commit 2b844ba79f4a114bd228ad6fee040ffd99a0963d upstream. |
| |
| This reverts commit f6308b36c411 (ACPI: Add BayTrail SoC GPIO and LPSS |
| ACPI IDs), because it causes the Alan Cox' ASUS T100TA to "crash and |
| burn" during boot if the Baytrail pinctrl driver is compiled in. |
| |
| Fixes: f6308b36c411 (ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs) |
| Reported-by: One Thousand Gnomes <gnomes@lxorguk.ukuu.org.uk> |
| Requested-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/acpi/acpi_lpss.c | 1 - |
| drivers/pinctrl/pinctrl-baytrail.c | 1 - |
| 2 files changed, 2 deletions(-) |
| |
| --- a/drivers/acpi/acpi_lpss.c |
| +++ b/drivers/acpi/acpi_lpss.c |
| @@ -156,7 +156,6 @@ static const struct acpi_device_id acpi_ |
| { "80860F14", (unsigned long)&byt_sdio_dev_desc }, |
| { "80860F41", (unsigned long)&byt_i2c_dev_desc }, |
| { "INT33B2", }, |
| - { "INT33FC", }, |
| |
| { } |
| }; |
| --- a/drivers/pinctrl/pinctrl-baytrail.c |
| +++ b/drivers/pinctrl/pinctrl-baytrail.c |
| @@ -512,7 +512,6 @@ static const struct dev_pm_ops byt_gpio_ |
| |
| static const struct acpi_device_id byt_gpio_acpi_match[] = { |
| { "INT33B2", 0 }, |
| - { "INT33FC", 0 }, |
| { } |
| }; |
| MODULE_DEVICE_TABLE(acpi, byt_gpio_acpi_match); |