mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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
This commit is contained in:
commit
7ef97e0e3a
4 changed files with 21 additions and 1 deletions
|
@ -113,6 +113,14 @@ static void lpss_i2c_setup(struct lpss_private_data *pdata)
|
||||||
writel(val, pdata->mmio_base + offset);
|
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 = {
|
static struct lpss_device_desc lpt_dev_desc = {
|
||||||
.clk_required = true,
|
.clk_required = true,
|
||||||
.prv_offset = 0x800,
|
.prv_offset = 0x800,
|
||||||
|
@ -226,6 +234,8 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = {
|
||||||
{ "INT3436", LPSS_ADDR(lpt_sdio_dev_desc) },
|
{ "INT3436", LPSS_ADDR(lpt_sdio_dev_desc) },
|
||||||
{ "INT3437", },
|
{ "INT3437", },
|
||||||
|
|
||||||
|
{ "INT3438", LPSS_ADDR(wpt_dev_desc) },
|
||||||
|
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/suspend.h>
|
#include <linux/suspend.h>
|
||||||
#include <linux/delay.h>
|
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI_PROCFS_POWER
|
#ifdef CONFIG_ACPI_PROCFS_POWER
|
||||||
|
|
|
@ -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);
|
map_lapic_id(header, acpi_id, &apic_id);
|
||||||
} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
|
} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
|
||||||
map_lsapic_id(header, type, acpi_id, &apic_id);
|
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:
|
exit:
|
||||||
|
|
|
@ -673,6 +673,15 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.callback = video_set_use_native_backlight,
|
.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",
|
.ident = "HP ZBook 14",
|
||||||
.matches = {
|
.matches = {
|
||||||
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
|
DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
|
||||||
|
|
Loading…
Reference in a new issue