Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36065746 authored by Peter Feuerer's avatar Peter Feuerer Committed by Len Brown
Browse files

acerhdf: add new BIOS versions 



Added new BIOS versions for following netbooks: Acer 1410, Gateway LT31,
Packard Bell DOA150.  As the Gateway LT31 machines have different register
values for setting and checking the off-state, the "cmd_off" variable has
been splitted up to "cmd_off" and "chk_off".

Signed-off-by: default avatarPeter Feuerer <peter@piie.net>
Cc: Borislav Petkov <petkovbb@gmail.com>
Cc: Andreas Mohr <andi@lisas.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent bf2abdd7

drivers/platform/x86/acerhdf.c

+37 −26
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
 */

#undef START_IN_KERNEL_MODE



#define DRV_VER "0.5.18"

#define DRV_VER "0.5.20"



/*

 * According to the Atom N270 datasheet,
@@ -112,12 +112,14 @@ module_param_string(force_product, force_product, 16, 0); 
MODULE_PARM_DESC(force_product, "Force BIOS product and omit BIOS check");



/*

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

 * cmd_off: to switch the fan completely 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

 *		the fan speed depending on the temperature

 */

struct fancmd {

	u8 cmd_off;

	u8 chk_off;

	u8 cmd_auto;

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

static const struct bios_settings_t bios_tbl[] = {

	/* AOA110 */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	/* AOA150 */

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	/* Acer 1410 */

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

	/* special BIOS / other */

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

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

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

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

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

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

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

	{"Gateway         ", "LT31            ", "v1.3103 ", 0x55, 0x58,

		{0x10, 0x0f, 0x00} },

	{"Gateway         ", "LT31            ", "v1.3201 ", 0x55, 0x58,

		{0x10, 0x0f, 0x00} },

	{"Gateway         ", "LT31            ", "v1.3302 ", 0x55, 0x58,

		{0x10, 0x0f, 0x00} },

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

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

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

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

	/* pewpew-terminator */

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

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

};



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

		return -EINVAL;



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

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

		*state = ACERHDF_FAN_AUTO;

	else

		*state = ACERHDF_FAN_OFF;