Commit ff43fa8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of... 

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  wmi: use memcmp instead of strncmp to compare GUIDs
  ACPI, hp-wmi: Fix memory leak in acpi query
  msi-wmi: fix semantically incorrect use of keycode instead of scancode
  msi-wmi: Add mute key support
  asus-laptop: add wimax and wwan support
  eeepc-wmi: fix compiler warning
  ibm_rtl: _RTL_ is not available in UEFI mode
  ibm_rtl: Loosen the DMI criteria to all IBM machines
  drivers/platform/x86/thinkpad_acpi.c: delete double assignment
  eeepc-wmi: add cpufv sysfs documentation
  toshiba_acpi.c: Add key_entry for a lone FN keypress
  ibm_rtl: fix printk format warning
parents c2048b0a 8b14d7b2

Documentation/ABI/testing/sysfs-platform-asus-laptop

+15 −1
Original line number Diff line number Diff line
@@ -47,6 +47,20 @@ Date: January 2007 
KernelVersion:	2.6.20

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the bluetooth device. 1 means on, 0 means off.

		Control the wlan device. 1 means on, 0 means off.

		This may control the led, the device or both.

Users:		Lapsus



What:		/sys/devices/platform/asus_laptop/wimax

Date:		October 2010

KernelVersion:	2.6.37

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the wimax device. 1 means on, 0 means off.



What:		/sys/devices/platform/asus_laptop/wwan

Date:		October 2010

KernelVersion:	2.6.37

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Control the wwan (3G) device. 1 means on, 0 means off.

Documentation/ABI/testing/sysfs-platform-eeepc-wmi

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/devices/platform/eeepc-wmi/cpufv

Date:		Oct 2010

KernelVersion:	2.6.37

Contact:	"Corentin Chary" <corentincj@iksaif.net>

Description:

		Change CPU clock configuration (write-only).

		There are three available clock configuration:

		    * 0 -> Super Performance Mode

		    * 1 -> High Performance Mode

		    * 2 -> Power Saving Mode

drivers/platform/x86/asus-laptop.c

+96 −1
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ MODULE_PARM_DESC(wapf, "WAPF value"); 


static int wlan_status = 1;

static int bluetooth_status = 1;

static int wimax_status = -1;

static int wwan_status = -1;



module_param(wlan_status, int, 0444);

MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot "
@@ -92,6 +94,16 @@ MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " 
		 "(0 = disabled, 1 = enabled, -1 = don't do anything). "

		 "default is 1");



module_param(wimax_status, int, 0444);

MODULE_PARM_DESC(wimax_status, "Set the wireless status on boot "

		 "(0 = disabled, 1 = enabled, -1 = don't do anything). "

		 "default is 1");



module_param(wwan_status, int, 0444);

MODULE_PARM_DESC(wwan_status, "Set the wireless status on boot "

		 "(0 = disabled, 1 = enabled, -1 = don't do anything). "

		 "default is 1");



/*

 * Some events we use, same for all Asus

 */
@@ -114,6 +126,8 @@ MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " 
 */

#define WL_RSTS		0x01	/* internal Wifi */

#define BT_RSTS		0x02	/* internal Bluetooth */

#define WM_RSTS		0x08    /* internal wimax */

#define WW_RSTS		0x20    /* internal wwan */



/* LED */

#define METHOD_MLED		"MLED"
@@ -132,6 +146,11 @@ MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " 
 */

#define METHOD_WLAN		"WLED"

#define METHOD_BLUETOOTH	"BLED"



/* WWAN and WIMAX */

#define METHOD_WWAN		"GSMC"

#define METHOD_WIMAX		"WMXC"



#define METHOD_WL_STATUS	"RSTS"



/* Brightness */
@@ -882,6 +901,64 @@ static ssize_t store_bluetooth(struct device *dev, 
	return sysfs_acpi_set(asus, buf, count, METHOD_BLUETOOTH);

}



/*

 * Wimax

 */

static int asus_wimax_set(struct asus_laptop *asus, int status)

{

	if (write_acpi_int(asus->handle, METHOD_WIMAX, !!status)) {

		pr_warning("Error setting wimax status to %d", status);

		return -EIO;

	}

	return 0;

}



static ssize_t show_wimax(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	struct asus_laptop *asus = dev_get_drvdata(dev);



	return sprintf(buf, "%d\n", asus_wireless_status(asus, WM_RSTS));

}



static ssize_t store_wimax(struct device *dev,

			       struct device_attribute *attr, const char *buf,

			       size_t count)

{

	struct asus_laptop *asus = dev_get_drvdata(dev);



	return sysfs_acpi_set(asus, buf, count, METHOD_WIMAX);

}



/*

 * Wwan

 */

static int asus_wwan_set(struct asus_laptop *asus, int status)

{

	if (write_acpi_int(asus->handle, METHOD_WWAN, !!status)) {

		pr_warning("Error setting wwan status to %d", status);

		return -EIO;

	}

	return 0;

}



static ssize_t show_wwan(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	struct asus_laptop *asus = dev_get_drvdata(dev);



	return sprintf(buf, "%d\n", asus_wireless_status(asus, WW_RSTS));

}



static ssize_t store_wwan(struct device *dev,

			       struct device_attribute *attr, const char *buf,

			       size_t count)

{

	struct asus_laptop *asus = dev_get_drvdata(dev);



	return sysfs_acpi_set(asus, buf, count, METHOD_WWAN);

}



/*

 * Display

 */
@@ -1202,6 +1279,8 @@ static DEVICE_ATTR(infos, S_IRUGO, show_infos, NULL); 
static DEVICE_ATTR(wlan, S_IRUGO | S_IWUSR, show_wlan, store_wlan);

static DEVICE_ATTR(bluetooth, S_IRUGO | S_IWUSR,

		   show_bluetooth, store_bluetooth);

static DEVICE_ATTR(wimax, S_IRUGO | S_IWUSR, show_wimax, store_wimax);

static DEVICE_ATTR(wwan, S_IRUGO | S_IWUSR, show_wwan, store_wwan);

static DEVICE_ATTR(display, S_IRUGO | S_IWUSR, show_disp, store_disp);

static DEVICE_ATTR(ledd, S_IRUGO | S_IWUSR, show_ledd, store_ledd);

static DEVICE_ATTR(ls_level, S_IRUGO | S_IWUSR, show_lslvl, store_lslvl);
@@ -1212,6 +1291,8 @@ static struct attribute *asus_attributes[] = { 
	&dev_attr_infos.attr,

	&dev_attr_wlan.attr,

	&dev_attr_bluetooth.attr,

	&dev_attr_wimax.attr,

	&dev_attr_wwan.attr,

	&dev_attr_display.attr,

	&dev_attr_ledd.attr,

	&dev_attr_ls_level.attr,
@@ -1239,6 +1320,13 @@ static mode_t asus_sysfs_is_visible(struct kobject *kobj, 
	} else if (attr == &dev_attr_display.attr) {

		supported = !acpi_check_handle(handle, METHOD_SWITCH_DISPLAY, NULL);



	} else if (attr == &dev_attr_wimax.attr) {

		supported =

			!acpi_check_handle(asus->handle, METHOD_WIMAX, NULL);



	} else if (attr == &dev_attr_wwan.attr) {

		supported = !acpi_check_handle(asus->handle, METHOD_WWAN, NULL);



	} else if (attr == &dev_attr_ledd.attr) {

		supported = !acpi_check_handle(handle, METHOD_LEDD, NULL);
@@ -1397,7 +1485,8 @@ static int asus_laptop_get_info(struct asus_laptop *asus) 


	/*

	 * The HWRS method return informations about the hardware.

	 * 0x80 bit is for WLAN, 0x100 for Bluetooth.

	 * 0x80 bit is for WLAN, 0x100 for Bluetooth,

	 * 0x40 for WWAN, 0x10 for WIMAX.

	 * The significance of others is yet to be found.

	 */

	status =
@@ -1440,6 +1529,12 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus) 
	if (wlan_status >= 0)

		asus_wlan_set(asus, !!wlan_status);



	if (wimax_status >= 0)

		asus_wimax_set(asus, !!wimax_status);



	if (wwan_status >= 0)

		asus_wwan_set(asus, !!wwan_status);



	/* Keyboard Backlight is on by default */

	if (!acpi_check_handle(asus->handle, METHOD_KBD_LIGHT_SET, NULL))

		asus_kled_set(asus, 1);

drivers/platform/x86/eeepc-wmi.c

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void eeepc_wmi_notify(u32 value, void *context) 
	kfree(obj);

}



static int store_cpufv(struct device *dev, struct device_attribute *attr,

static ssize_t store_cpufv(struct device *dev, struct device_attribute *attr,

			   const char *buf, size_t count)

{

	int value;

drivers/platform/x86/hp-wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ static int hp_wmi_perform_query(int query, int write, u32 *buffer, 
	bios_return = *((struct bios_return *)obj->buffer.pointer);



	memcpy(buffer, &bios_return.value, sizeof(bios_return.value));



	kfree(obj);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE