From: Greg Kroah-Hartman Date: Thu, 2 Jan 2014 18:42:04 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.76~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fda0c98dcc6551637b843aad06f2ee32ae959e0;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-stable patches added patches: acpi-add-baytrail-soc-gpio-and-lpss-acpi-ids.patch --- diff --git a/queue-3.12/acpi-add-baytrail-soc-gpio-and-lpss-acpi-ids.patch b/queue-3.12/acpi-add-baytrail-soc-gpio-and-lpss-acpi-ids.patch new file mode 100644 index 00000000000..eaa8a627687 --- /dev/null +++ b/queue-3.12/acpi-add-baytrail-soc-gpio-and-lpss-acpi-ids.patch @@ -0,0 +1,44 @@ +From f6308b36c411dc5afd6a6f73e6454722bfde57b7 Mon Sep 17 00:00:00 2001 +From: Paul Drews +Date: Mon, 25 Nov 2013 14:15:55 -0800 +Subject: ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs + +From: Paul Drews + +commit f6308b36c411dc5afd6a6f73e6454722bfde57b7 upstream. + +This adds the new ACPI ID (INT33FC) for the BayTrail GPIO +banks as seen on a BayTrail M System-On-Chip platform. This +ACPI ID is used by the BayTrail GPIO (pinctrl) driver to +manage the Low Power Subsystem (LPSS). + +Signed-off-by: Paul Drews +Acked-by: Linus Walleij +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/acpi_lpss.c | 1 + + drivers/pinctrl/pinctrl-baytrail.c | 1 + + 2 files changed, 2 insertions(+) + +--- a/drivers/acpi/acpi_lpss.c ++++ b/drivers/acpi/acpi_lpss.c +@@ -156,6 +156,7 @@ 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,6 +512,7 @@ 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); diff --git a/queue-3.12/series b/queue-3.12/series index 7b9b5110ce0..492f570ff2a 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -46,3 +46,4 @@ arm-dra7-hwmod-fix-boot-crash-with-debug_ll.patch arm-omap2-hwmod_data-fix-missing-omap_intc_start-in-irq-data.patch arm-omap2-fix-lcd-panel-backlight-regression-for-ldp-legacy-booting.patch x86-idle-repair-large-server-50-watt-idle-power-regression.patch +acpi-add-baytrail-soc-gpio-and-lpss-acpi-ids.patch