Commit 210183d4 authored by Peter Feuerer's avatar Peter Feuerer Committed by Matthew Garrett
Browse files

acerhdf: remove "chk_off" as it was only needed for T31 netbooks 



Remove "chk_off" as it was only needed for T31 netbooks.  But those
netbooks can also be handled just with "cmd_off" register (0x9e) for
reading the state back.

Signed-off-by: default avatarPeter Feuerer <peter@piie.net>
Cc: Borislav Petkov <petkovbb@gmail.com>
Cc: Andreas Mohr <andi@lisas.de>
Cc: Len Brown <lenb@kernel.org>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 887b7ca9

drivers/platform/x86/acerhdf.c

+45 −47
Original line number Original line Diff line number Diff line
@@ -112,14 +112,12 @@ module_param_string(force_product, force_product, 16, 0); 
MODULE_PARM_DESC(force_product, "Force BIOS product and omit BIOS check");

MODULE_PARM_DESC(force_product, "Force BIOS product and omit BIOS check");





/*

/*

 * cmd_off: to switch the fan completely off

 * cmd_off: to switch the fan completely off and check if the fan is off

 * chk_off: to check if the fan is off

 *	cmd_auto: to set the BIOS in control of the fan. The BIOS regulates then

 *	cmd_auto: to set the BIOS in control of the fan. The BIOS regulates then

 *		the fan speed depending on the temperature

 *		the fan speed depending on the temperature

 */

 */

struct fancmd {

struct fancmd {

	u8 cmd_off;

	u8 cmd_off;

	u8 chk_off;

	u8 cmd_auto;

	u8 cmd_auto;

};

};
@@ -136,55 +134,55 @@ struct bios_settings_t { 
/* Register addresses and values for different BIOS versions */

/* Register addresses and values for different BIOS versions */

static const struct bios_settings_t bios_tbl[] = {

static const struct bios_settings_t bios_tbl[] = {

	/* AOA110 */

	/* AOA110 */

	{"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x1f, 0x00} },

	{"Acer", "AOA110", "v0.3109", 0x55, 0x58, {0x1f, 0x00} },

	{"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x1f, 0x00} },

	{"Acer", "AOA110", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },

	{"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3301", 0x55, 0x58, {0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3304", 0x55, 0x58, {0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3305", 0x55, 0x58, {0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3307", 0x55, 0x58, {0xaf, 0x00} },

	{"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x21, 0x00} },

	{"Acer", "AOA110", "v0.3308", 0x55, 0x58, {0x21, 0x00} },

	{"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x21, 0x00} },

	{"Acer", "AOA110", "v0.3309", 0x55, 0x58, {0x21, 0x00} },

	{"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x21, 0x00} },

	{"Acer", "AOA110", "v0.3310", 0x55, 0x58, {0x21, 0x00} },

	/* AOA150 */

	/* AOA150 */

	{"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x1f, 0x1f, 0x00} },

	{"Acer", "AOA150", "v0.3114", 0x55, 0x58, {0x1f, 0x00} },

	{"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Acer", "AOA150", "v0.3301", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Acer", "AOA150", "v0.3304", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Acer", "AOA150", "v0.3305", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Acer", "AOA150", "v0.3307", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Acer", "AOA150", "v0.3308", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Acer", "AOA150", "v0.3309", 0x55, 0x58, {0x20, 0x00} },

	{"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Acer", "AOA150", "v0.3310", 0x55, 0x58, {0x20, 0x00} },

	/* Acer 1410 */

	/* Acer 1410 */

	{"Acer", "Aspire 1410", "v0.3115", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v0.3115", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v0.3120", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v0.3120", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3303", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1410", "v1.3303", 0x55, 0x58, {0x9e, 0x00} },

	/* Acer 1810xx */

	/* Acer 1810xx */

	{"Acer", "Aspire 1810TZ", "v0.3115", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v0.3115", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T", "v0.3115", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v0.3115", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v0.3119", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v0.3119", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T", "v0.3119", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v0.3119", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v0.3120", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v0.3120", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T", "v0.3120", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v0.3120", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v1.3204", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v1.3204", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T", "v1.3204", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v1.3204", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v1.3303", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810TZ", "v1.3303", 0x55, 0x58, {0x9e, 0x00} },

	{"Acer", "Aspire 1810T", "v1.3303", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Acer", "Aspire 1810T",  "v1.3303", 0x55, 0x58, {0x9e, 0x00} },

	/* Gateway */

	/* Gateway */

	{"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x21, 0x00} },

	{"Gateway", "AOA110", "v0.3103", 0x55, 0x58, {0x21, 0x00} },

	{"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Gateway", "AOA150", "v0.3103", 0x55, 0x58, {0x20, 0x00} },

	{"Gateway", "LT31", "v1.3103", 0x55, 0x58, {0x10, 0x0f, 0x00} },

	{"Gateway", "LT31",   "v1.3103", 0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31", "v1.3201", 0x55, 0x58, {0x10, 0x0f, 0x00} },

	{"Gateway", "LT31",   "v1.3201", 0x55, 0x58, {0x9e, 0x00} },

	{"Gateway", "LT31", "v1.3302", 0x55, 0x58, {0x10, 0x0f, 0x00} },

	{"Gateway", "LT31",   "v1.3302", 0x55, 0x58, {0x9e, 0x00} },

	/* Packard Bell */

	/* Packard Bell */

	{"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x21, 0x00} },

	{"Packard Bell", "DOA150", "v0.3104", 0x55, 0x58, {0x21, 0x00} },

	{"Packard Bell", "DOA150", "v0.3105", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Packard Bell", "DOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00} },

	{"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x21, 0x00} },

	{"Packard Bell", "AOA110", "v0.3105", 0x55, 0x58, {0x21, 0x00} },

	{"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x20, 0x00} },

	{"Packard Bell", "AOA150", "v0.3105", 0x55, 0x58, {0x20, 0x00} },

	{"Packard Bell", "DOTMU", "v1.3303", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Packard Bell", "DOTMU",  "v1.3303", 0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMU", "v0.3120", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Packard Bell", "DOTMU",  "v0.3120", 0x55, 0x58, {0x9e, 0x00} },

	{"Packard Bell", "DOTMA", "v1.3201", 0x55, 0x58, {0x9e, 0x9e, 0x00} },

	{"Packard Bell", "DOTMA",  "v1.3201", 0x55, 0x58, {0x9e, 0x00} },

	/* pewpew-terminator */

	/* pewpew-terminator */

	{"", "", "", 0, 0, {0, 0, 0} }

	{"", "", "", 0, 0, {0, 0} }

};

};





static const struct bios_settings_t *bios_cfg __read_mostly;

static const struct bios_settings_t *bios_cfg __read_mostly;
@@ -208,7 +206,7 @@ static int acerhdf_get_fanstate(int *state) 
	if (ec_read(bios_cfg->fanreg, &fan))

	if (ec_read(bios_cfg->fanreg, &fan))

		return -EINVAL;

		return -EINVAL;





	if (fan != bios_cfg->cmd.chk_off)

	if (fan != bios_cfg->cmd.cmd_off)

		*state = ACERHDF_FAN_AUTO;

		*state = ACERHDF_FAN_AUTO;

	else

	else

		*state = ACERHDF_FAN_OFF;

		*state = ACERHDF_FAN_OFF;

CRA Git | Maintained and supported by SUSTech CRA and CCSE