diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2015-01-12 14:32:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-25 18:17:58 +0100 |
| commit | 34ae40f6c91c2267af1dd3c0495082e8b9f9969e (patch) | |
| tree | 1462c4bff2018e07a92f0a52e35510c3afbc00a5 /drivers/char | |
| parent | i8k: Rework error retries (diff) | |
| download | linux-34ae40f6c91c2267af1dd3c0495082e8b9f9969e.tar.xz linux-34ae40f6c91c2267af1dd3c0495082e8b9f9969e.zip | |
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: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/i8k.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index 0e332fcd8fc3..8ec4c371dc50 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c @@ -705,7 +705,7 @@ enum i8k_configs { DELL_LATITUDE_E6540, DELL_PRECISION_490, DELL_STUDIO, - DELL_XPS_M140, + DELL_XPS, }; 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_max = I8K_FAN_HIGH, }, - [DELL_XPS_M140] = { + [DELL_XPS] = { .fan_mult = 1, .fan_max = I8K_FAN_HIGH, }, @@ -837,12 +837,20 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { .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", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "MXC051"), }, - .driver_data = (void *)&i8k_config_data[DELL_XPS_M140], + .driver_data = (void *)&i8k_config_data[DELL_XPS], }, { } }; |