Commit 34ae40f6 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

i8k: Add support for Dell XPS 13

XPS 13 does not support turbo speed, so its initialization data
matches that of XPS M140. Make XPS initialization data generic,
and add support for XPS 13.
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 564132d9
...@@ -705,7 +705,7 @@ enum i8k_configs { ...@@ -705,7 +705,7 @@ enum i8k_configs {
DELL_LATITUDE_E6540, DELL_LATITUDE_E6540,
DELL_PRECISION_490, DELL_PRECISION_490,
DELL_STUDIO, DELL_STUDIO,
DELL_XPS_M140, DELL_XPS,
}; };
static const struct i8k_config_data i8k_config_data[] = { static const struct i8k_config_data i8k_config_data[] = {
...@@ -725,7 +725,7 @@ static const struct i8k_config_data i8k_config_data[] = { ...@@ -725,7 +725,7 @@ static const struct i8k_config_data i8k_config_data[] = {
.fan_mult = 1, .fan_mult = 1,
.fan_max = I8K_FAN_HIGH, .fan_max = I8K_FAN_HIGH,
}, },
[DELL_XPS_M140] = { [DELL_XPS] = {
.fan_mult = 1, .fan_mult = 1,
.fan_max = I8K_FAN_HIGH, .fan_max = I8K_FAN_HIGH,
}, },
...@@ -836,13 +836,21 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { ...@@ -836,13 +836,21 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = {
}, },
.driver_data = (void *)&i8k_config_data[DELL_STUDIO], .driver_data = (void *)&i8k_config_data[DELL_STUDIO],
}, },
{
.ident = "Dell XPS 13",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "XPS13"),
},
.driver_data = (void *)&i8k_config_data[DELL_XPS],
},
{ {
.ident = "Dell XPS M140", .ident = "Dell XPS M140",
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_MATCH(DMI_PRODUCT_NAME, "MXC051"), DMI_MATCH(DMI_PRODUCT_NAME, "MXC051"),
}, },
.driver_data = (void *)&i8k_config_data[DELL_XPS_M140], .driver_data = (void *)&i8k_config_data[DELL_XPS],
}, },
{ } { }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment