Merge branches 'acpi-video', 'acpi-battery', 'acpi-processor' and 'acpi-lpss'

* acpi-video:
  ACPI / video: Add use_native_backlight quirk for HP EliteBook 2014 models

* acpi-battery:
  ACPI / battery: remove duplicated include from battery.c

* acpi-processor:
  ACPI / processor: Make it possible to get local x2apic id via _MAT

* acpi-lpss:
  ACPI / LPSS: add LPSS device for Wildcat Point PCH

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 9cb65b0e7597287531144d876d9eaed132ae7b5a..ce06149088c5b5366cd4c87b67dfffdb793fc7a6 100644 (file)
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -113,6 +113,14 @@ static void lpss_i2c_setup(struct lpss_private_data *pdata)
        writel(val, pdata->mmio_base + offset);
 }
 
+static struct lpss_device_desc wpt_dev_desc = {
+       .clk_required = true,
+       .prv_offset = 0x800,
+       .ltr_required = true,
+       .clk_divider = true,
+       .clk_gate = true,
+};
+
 static struct lpss_device_desc lpt_dev_desc = {
        .clk_required = true,
        .prv_offset = 0x800,
@@ -226,6 +234,8 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = {
        { "INT3436", LPSS_ADDR(lpt_sdio_dev_desc) },
        { "INT3437", },
 
+       { "INT3438", LPSS_ADDR(wpt_dev_desc) },
+
        { }
 };
 

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 130f513e08c92d90532d11b1075e46eacf23414a..48bcf38a0ea895fc34ea045ccddf339beee5c3a3 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -35,7 +35,6 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/suspend.h>
-#include <linux/delay.h>
 #include <asm/unaligned.h>
 
 #ifdef CONFIG_ACPI_PROCFS_POWER

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 00f48d13a51630df09afced52ac4c77abdec5240..e32321ce9a5cfbc4a80e7101b2784506ff057fc6 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -129,6 +129,8 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
                map_lapic_id(header, acpi_id, &apic_id);
        } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
                map_lsapic_id(header, type, acpi_id, &apic_id);
+       } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
+               map_x2apic_id(header, type, acpi_id, &apic_id);
        }
 
 exit:

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 18c0e6920eb41fdce3374c48d8946ed12f89fc76..826884392e6b4b9df067623cfad758c29ea954a7 100644 (file)
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -673,6 +673,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
        },
        {
        .callback = video_set_use_native_backlight,
+       .ident = "HP EliteBook 2014 models",
+       .matches = {
+               DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+               DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook "),
+               DMI_MATCH(DMI_PRODUCT_NAME, " G2"),
+               },
+       },
+       {
+       .callback = video_set_use_native_backlight,
        .ident = "HP ZBook 14",
        .matches = {
                DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),