On Sun, 30 Nov 2014 13:00:40 -0800, Guenter Roeck wrote:
> 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.
>
> Cc: Pali Rohár <pali.ro...@gmail.com>
> Signed-off-by: Guenter Roeck <li...@roeck-us.net>
> ---
> Applies on top of Pali's patch series.
>
> drivers/char/i8k.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
> index cdb2dc7..6d2caa9 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,
> },
> @@ -829,12 +829,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],
> },
> { }
> };
Looks reasonable.
Reviewed-by: Jean Delvare <jdelv...@suse.de>
--
Jean Delvare
SUSE L3 Support
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
