]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
i8k: Add support for Dell XPS 13
authorGuenter Roeck <linux@roeck-us.net>
Mon, 12 Jan 2015 13:32:01 +0000 (14:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Jan 2015 17:17:58 +0000 (09:17 -0800)
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>
drivers/char/i8k.c

index 0e332fcd8fc334506a390f627ad95674d6115597..8ec4c371dc504e285d476991733ee40468ef2aa7 100644 (file)
@@ -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,
        },
@@ -836,13 +836,21 @@ 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],
        },
        { }
 };