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

Commit 46d0e9e0 authored by Lee, Chun-Yi's avatar Lee, Chun-Yi Committed by Greg Kroah-Hartman
Browse files

msi-laptop: Support standard ec 66/62 command on MSI notebook and nebook 



Suppport standard ec 66/62 command on MSI notebook and nebook. MSI
netbook and notebook already support 66/62 command, so, add new
get_state function, and put the old model to non-standard model, but
driver still support those old model.

Signed-off-by: default avatarLee, Chun-Yi <jlee@novell.com>
Cc: Lennart Poettering <mzxreary@0pointer.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8e9394ce

drivers/platform/x86/msi-laptop.c

+39 −4
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ 
#define MSI_EC_COMMAND_WIRELESS 0x10

#define MSI_EC_COMMAND_LCD_LEVEL 0x11



#define MSI_STANDARD_EC_COMMAND_ADDRESS	0x2e

#define MSI_STANDARD_EC_BLUETOOTH_MASK	(1 << 0)

#define MSI_STANDARD_EC_WEBCAM_MASK	(1 << 1)

#define MSI_STANDARD_EC_WLAN_MASK	(1 << 3)



static int force;

module_param(force, bool, 0);

MODULE_PARM_DESC(force, "Force driver load, ignore DMI data");
@@ -74,6 +79,9 @@ static int auto_brightness; 
module_param(auto_brightness, int, 0);

MODULE_PARM_DESC(auto_brightness, "Enable automatic brightness control (0: disabled; 1: enabled; 2: don't touch)");



static bool old_ec_model;

static int wlan_s, bluetooth_s;



/* Hardware access */



static int set_lcd_level(int level)
@@ -148,6 +156,22 @@ static int get_wireless_state(int *wlan, int *bluetooth) 
	return 0;

}



static int get_wireless_state_ec_standard(void)

{

	u8 rdata;

	int result;



	result = ec_read(MSI_STANDARD_EC_COMMAND_ADDRESS, &rdata);

	if (result < 0)

		return -1;



	wlan_s = !!(rdata & MSI_STANDARD_EC_WLAN_MASK);



	bluetooth_s = !!(rdata & MSI_STANDARD_EC_BLUETOOTH_MASK);



	return 0;

}



/* Backlight device stuff */



static int bl_get_brightness(struct backlight_device *b)
@@ -176,7 +200,12 @@ static ssize_t show_wlan(struct device *dev, 


	int ret, enabled;



	if (old_ec_model) {

		ret = get_wireless_state(&enabled, NULL);

	} else {

		ret = get_wireless_state_ec_standard();

		enabled = wlan_s;

	}

	if (ret < 0)

		return ret;
@@ -189,7 +218,12 @@ static ssize_t show_bluetooth(struct device *dev, 


	int ret, enabled;



	if (old_ec_model) {

		ret = get_wireless_state(NULL, &enabled);

	} else {

		ret = get_wireless_state_ec_standard();

		enabled = bluetooth_s;

	}

	if (ret < 0)

		return ret;
@@ -339,8 +373,8 @@ static int __init msi_init(void) 
	if (acpi_disabled)

		return -ENODEV;



	if (!force && !dmi_check_system(msi_dmi_table))

		return -ENODEV;

	if (force || dmi_check_system(msi_dmi_table))

		old_ec_model = 1;



	if (auto_brightness < 0 || auto_brightness > 2)

		return -EINVAL;
@@ -435,3 +469,4 @@ MODULE_ALIAS("dmi:*:svnMICRO-STARINT'LCO.,LTD:pnMS-1013:pvr0131*:cvnMICRO-STARIN 
MODULE_ALIAS("dmi:*:svnMicro-StarInternational:pnMS-1058:pvr0581:rvnMSI:rnMS-1058:*:ct10:*");

MODULE_ALIAS("dmi:*:svnMicro-StarInternational:pnMS-1412:*:rvnMSI:rnMS-1412:*:cvnMICRO-STARINT'LCO.,LTD:ct10:*");

MODULE_ALIAS("dmi:*:svnNOTEBOOK:pnSAM2000:pvr0131*:cvnMICRO-STARINT'LCO.,LTD:ct10:*");

MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-N034:*");