Commit 7d3d09b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86 

Pull x86 platform driver updates from Matthew Garrett:
 "Nothing overly dramatic here - improved support for the Classmate,
  some random small fixes and a rework of backlight management to deal
  with some of the more awkward cases."

* 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86:
  thinkpad_acpi: Free hotkey_keycode_map after unregistering tpacpi_inputdev
  thinkpad_acpi: Fix a memory leak during module exit
  thinkpad_acpi: Flush the workqueue before freeing tpacpi_leds
  dell-laptop: Add 6 machines to touchpad led quirk
  ACER: Fix Smatch double-free issue
  ACER: Fix up sparse warning
  asus-nb-wmi: add some video toggle keys
  asus-nb-wmi: add wapf quirk for ASUS machines
  classmate-laptop: Fix extra keys hardware id.
  classmate-laptop: Add support for Classmate V4 accelerometer.
  asus-wmi: enable resume on lid open
  asus-wmi: control backlight power through WMI, not ACPI
  samsung-laptop: support R40/R41
  acpi/video_detect: blacklist samsung x360
  samsung-laptop: X360 ACPI backlight device is broken
  drivers-platform-x86: use acpi_video_dmi_promote_vendor()
  acpi: add a way to promote/demote vendor backlight drivers
  ACER: Add support for accelerometer sensor
  asus-wmi: use ASUS_WMI_METHODID_DSTS2 as default DSTS ID.
parents 287dc4b7 00d39597

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -29,3 +29,10 @@ KernelVersion: 2.6.39 
Contact:	"Corentin Chary" <corentincj@iksaif.net>

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

Description:

Description:

		Control the card touchpad. 1 means on, 0 means off.

		Control the card touchpad. 1 means on, 0 means off.



What:		/sys/devices/platform/<platform>/lid_resume

Date:		May 2012

KernelVersion:	3.5

Contact:	"AceLan Kao" <acelan.kao@canonical.com>

Description:

		Resume on lid open. 1 means on, 0 means off.

drivers/acpi/video_detect.c

+58 −2
Original line number Original line Diff line number Diff line
@@ -132,6 +132,33 @@ find_video(acpi_handle handle, u32 lvl, void *context, void **rv) 
	return AE_OK;

	return AE_OK;

}

}





/* Force to use vendor driver when the ACPI device is known to be

 * buggy */

static int video_detect_force_vendor(const struct dmi_system_id *d)

{

	acpi_video_support |= ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;

	return 0;

}



static struct dmi_system_id video_detect_dmi_table[] = {

	/* On Samsung X360, the BIOS will set a flag (VDRV) if generic

	 * ACPI backlight device is used. This flag will definitively break

	 * the backlight interface (even the vendor interface) untill next

	 * reboot. It's why we should prevent video.ko from being used here

	 * and we can't rely on a later call to acpi_video_unregister().

	 */

	{

	 .callback = video_detect_force_vendor,

	 .ident = "X360",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),

		DMI_MATCH(DMI_PRODUCT_NAME, "X360"),

		DMI_MATCH(DMI_BOARD_NAME, "X360"),

		},

	},

	{ },

};



/*

/*

 * Returns the video capabilities of a specific ACPI graphics device

 * Returns the video capabilities of a specific ACPI graphics device

 *

 *
@@ -164,6 +191,8 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle) 
		 *		ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;

		 *		ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;

		 *}

		 *}

		 */

		 */



		dmi_check_system(video_detect_dmi_table);

	} else {

	} else {

		status = acpi_bus_get_device(graphics_handle, &tmp_dev);

		status = acpi_bus_get_device(graphics_handle, &tmp_dev);

		if (ACPI_FAILURE(status)) {

		if (ACPI_FAILURE(status)) {
@@ -182,8 +211,7 @@ long acpi_video_get_capabilities(acpi_handle graphics_handle) 
}

}

EXPORT_SYMBOL(acpi_video_get_capabilities);

EXPORT_SYMBOL(acpi_video_get_capabilities);





/* Returns true if video.ko can do backlight switching */

static void acpi_video_caps_check(void)

int acpi_video_backlight_support(void)

{

{

	/*

	/*

	 * We must check whether the ACPI graphics device is physically plugged

	 * We must check whether the ACPI graphics device is physically plugged
@@ -191,6 +219,34 @@ int acpi_video_backlight_support(void) 
	 */

	 */

	if (!acpi_video_caps_checked)

	if (!acpi_video_caps_checked)

		acpi_video_get_capabilities(NULL);

		acpi_video_get_capabilities(NULL);

}



/* Promote the vendor interface instead of the generic video module.

 * This function allow DMI blacklists to be implemented by externals

 * platform drivers instead of putting a big blacklist in video_detect.c

 * After calling this function you will probably want to call

 * acpi_video_unregister() to make sure the video module is not loaded

 */

void acpi_video_dmi_promote_vendor(void)

{

	acpi_video_caps_check();

	acpi_video_support |= ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;

}

EXPORT_SYMBOL(acpi_video_dmi_promote_vendor);



/* To be called when a driver who previously promoted the vendor

 * interface */

void acpi_video_dmi_demote_vendor(void)

{

	acpi_video_caps_check();

	acpi_video_support &= ~ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;

}

EXPORT_SYMBOL(acpi_video_dmi_demote_vendor);



/* Returns true if video.ko can do backlight switching */

int acpi_video_backlight_support(void)

{

	acpi_video_caps_check();





	/* First check for boot param -> highest prio */

	/* First check for boot param -> highest prio */

	if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR)

	if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR)

drivers/platform/x86/acer-wmi.c

+146 −7
Original line number Original line Diff line number Diff line
@@ -95,6 +95,7 @@ MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026"); 




enum acer_wmi_event_ids {

enum acer_wmi_event_ids {

	WMID_HOTKEY_EVENT = 0x1,

	WMID_HOTKEY_EVENT = 0x1,

	WMID_ACCEL_EVENT = 0x5,

};

};





static const struct key_entry acer_wmi_keymap[] = {

static const struct key_entry acer_wmi_keymap[] = {
@@ -130,6 +131,7 @@ static const struct key_entry acer_wmi_keymap[] = { 
};

};





static struct input_dev *acer_wmi_input_dev;

static struct input_dev *acer_wmi_input_dev;

static struct input_dev *acer_wmi_accel_dev;





struct event_return_value {

struct event_return_value {

	u8 function;

	u8 function;
@@ -200,6 +202,7 @@ struct hotkey_function_type_aa { 
#define ACER_CAP_BLUETOOTH		(1<<2)

#define ACER_CAP_BLUETOOTH		(1<<2)

#define ACER_CAP_BRIGHTNESS		(1<<3)

#define ACER_CAP_BRIGHTNESS		(1<<3)

#define ACER_CAP_THREEG			(1<<4)

#define ACER_CAP_THREEG			(1<<4)

#define ACER_CAP_ACCEL			(1<<5)

#define ACER_CAP_ANY			(0xFFFFFFFF)

#define ACER_CAP_ANY			(0xFFFFFFFF)





/*

/*
@@ -1398,6 +1401,60 @@ static void acer_backlight_exit(void) 
	backlight_device_unregister(acer_backlight_device);

	backlight_device_unregister(acer_backlight_device);

}

}





/*

 * Accelerometer device

 */

static acpi_handle gsensor_handle;



static int acer_gsensor_init(void)

{

	acpi_status status;

	struct acpi_buffer output;

	union acpi_object out_obj;



	output.length = sizeof(out_obj);

	output.pointer = &out_obj;

	status = acpi_evaluate_object(gsensor_handle, "_INI", NULL, &output);

	if (ACPI_FAILURE(status))

		return -1;



	return 0;

}



static int acer_gsensor_open(struct input_dev *input)

{

	return acer_gsensor_init();

}



static int acer_gsensor_event(void)

{

	acpi_status status;

	struct acpi_buffer output;

	union acpi_object out_obj[5];



	if (!has_cap(ACER_CAP_ACCEL))

		return -1;



	output.length = sizeof(out_obj);

	output.pointer = out_obj;



	status = acpi_evaluate_object(gsensor_handle, "RDVL", NULL, &output);

	if (ACPI_FAILURE(status))

		return -1;



	if (out_obj->package.count != 4)

		return -1;



	input_report_abs(acer_wmi_accel_dev, ABS_X,

		(s16)out_obj->package.elements[0].integer.value);

	input_report_abs(acer_wmi_accel_dev, ABS_Y,

		(s16)out_obj->package.elements[1].integer.value);

	input_report_abs(acer_wmi_accel_dev, ABS_Z,

		(s16)out_obj->package.elements[2].integer.value);

	input_sync(acer_wmi_accel_dev);

	return 0;

}



/*

/*

 * Rfkill devices

 * Rfkill devices

 */

 */
@@ -1673,6 +1730,9 @@ static void acer_wmi_notify(u32 value, void *context) 
						   1, true);

						   1, true);

		}

		}

		break;

		break;

	case WMID_ACCEL_EVENT:

		acer_gsensor_event();

		break;

	default:

	default:

		pr_warn("Unknown function number - %d - %d\n",

		pr_warn("Unknown function number - %d - %d\n",

			return_value.function, return_value.key_num);

			return_value.function, return_value.key_num);
@@ -1758,6 +1818,73 @@ static int acer_wmi_enable_lm(void) 
	return status;

	return status;

}

}





static acpi_status __init acer_wmi_get_handle_cb(acpi_handle ah, u32 level,

						void *ctx, void **retval)

{

	*(acpi_handle *)retval = ah;

	return AE_OK;

}



static int __init acer_wmi_get_handle(const char *name, const char *prop,

					acpi_handle *ah)

{

	acpi_status status;

	acpi_handle handle;



	BUG_ON(!name || !ah);



	handle = NULL;

	status = acpi_get_devices(prop, acer_wmi_get_handle_cb,

					(void *)name, &handle);



	if (ACPI_SUCCESS(status)) {

		*ah = handle;

		return 0;

	} else {

		return -ENODEV;

	}

}



static int __init acer_wmi_accel_setup(void)

{

	int err;



	err = acer_wmi_get_handle("SENR", "BST0001", &gsensor_handle);

	if (err)

		return err;



	interface->capability |= ACER_CAP_ACCEL;



	acer_wmi_accel_dev = input_allocate_device();

	if (!acer_wmi_accel_dev)

		return -ENOMEM;



	acer_wmi_accel_dev->open = acer_gsensor_open;



	acer_wmi_accel_dev->name = "Acer BMA150 accelerometer";

	acer_wmi_accel_dev->phys = "wmi/input1";

	acer_wmi_accel_dev->id.bustype = BUS_HOST;

	acer_wmi_accel_dev->evbit[0] = BIT_MASK(EV_ABS);

	input_set_abs_params(acer_wmi_accel_dev, ABS_X, -16384, 16384, 0, 0);

	input_set_abs_params(acer_wmi_accel_dev, ABS_Y, -16384, 16384, 0, 0);

	input_set_abs_params(acer_wmi_accel_dev, ABS_Z, -16384, 16384, 0, 0);



	err = input_register_device(acer_wmi_accel_dev);

	if (err)

		goto err_free_dev;



	return 0;



err_free_dev:

	input_free_device(acer_wmi_accel_dev);

	return err;

}



static void acer_wmi_accel_destroy(void)

{

	input_unregister_device(acer_wmi_accel_dev);

}



static int __init acer_wmi_input_setup(void)

static int __init acer_wmi_input_setup(void)

{

{

	acpi_status status;

	acpi_status status;
@@ -1912,6 +2039,9 @@ static int acer_resume(struct device *dev) 
	if (has_cap(ACER_CAP_BRIGHTNESS))

	if (has_cap(ACER_CAP_BRIGHTNESS))

		set_u32(data->brightness, ACER_CAP_BRIGHTNESS);

		set_u32(data->brightness, ACER_CAP_BRIGHTNESS);





	if (has_cap(ACER_CAP_ACCEL))

		acer_gsensor_init();



	return 0;

	return 0;

}

}
@@ -2060,14 +2190,16 @@ static int __init acer_wmi_init(void) 




	set_quirks();

	set_quirks();





	if (dmi_check_system(video_vendor_dmi_table))

		acpi_video_dmi_promote_vendor();

	if (acpi_video_backlight_support()) {

	if (acpi_video_backlight_support()) {

		if (dmi_check_system(video_vendor_dmi_table)) {

			acpi_video_unregister();

		} else {

		interface->capability &= ~ACER_CAP_BRIGHTNESS;

		interface->capability &= ~ACER_CAP_BRIGHTNESS;

			pr_info("Brightness must be controlled by "

		pr_info("Brightness must be controlled by acpi video driver\n");

				"acpi video driver\n");

	} else {

		}

#ifdef CONFIG_ACPI_VIDEO

		pr_info("Disabling ACPI video driver\n");

		acpi_video_unregister();

#endif

	}

	}





	if (wmi_has_guid(WMID_GUID3)) {

	if (wmi_has_guid(WMID_GUID3)) {
@@ -2090,6 +2222,8 @@ static int __init acer_wmi_init(void) 
			return err;

			return err;

	}

	}





	acer_wmi_accel_setup();



	err = platform_driver_register(&acer_platform_driver);

	err = platform_driver_register(&acer_platform_driver);

	if (err) {

	if (err) {

		pr_err("Unable to register platform driver\n");

		pr_err("Unable to register platform driver\n");
@@ -2133,6 +2267,8 @@ error_device_alloc: 
error_platform_register:

error_platform_register:

	if (wmi_has_guid(ACERWMID_EVENT_GUID))

	if (wmi_has_guid(ACERWMID_EVENT_GUID))

		acer_wmi_input_destroy();

		acer_wmi_input_destroy();

	if (has_cap(ACER_CAP_ACCEL))

		acer_wmi_accel_destroy();





	return err;

	return err;

}

}
@@ -2142,6 +2278,9 @@ static void __exit acer_wmi_exit(void) 
	if (wmi_has_guid(ACERWMID_EVENT_GUID))

	if (wmi_has_guid(ACERWMID_EVENT_GUID))

		acer_wmi_input_destroy();

		acer_wmi_input_destroy();





	if (has_cap(ACER_CAP_ACCEL))

		acer_wmi_accel_destroy();



	remove_sysfs(acer_platform_device);

	remove_sysfs(acer_platform_device);

	remove_debugfs();

	remove_debugfs();

	platform_device_unregister(acer_platform_device);

	platform_device_unregister(acer_platform_device);

drivers/platform/x86/apple-gmux.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -193,7 +193,10 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, 
	 * backlight control and supports more levels than other options.

	 * backlight control and supports more levels than other options.

	 * Disable the other backlight choices.

	 * Disable the other backlight choices.

	 */

	 */

	acpi_video_dmi_promote_vendor();

#ifdef CONFIG_ACPI_VIDEO

	acpi_video_unregister();

	acpi_video_unregister();

#endif

	apple_bl_unregister();

	apple_bl_unregister();





	return 0;

	return 0;
@@ -213,7 +216,10 @@ static void __devexit gmux_remove(struct pnp_dev *pnp) 
	release_region(gmux_data->iostart, gmux_data->iolen);

	release_region(gmux_data->iostart, gmux_data->iolen);

	kfree(gmux_data);

	kfree(gmux_data);





	acpi_video_dmi_demote_vendor();

#ifdef CONFIG_ACPI_VIDEO

	acpi_video_register();

	acpi_video_register();

#endif

	apple_bl_register();

	apple_bl_register();

}

}

drivers/platform/x86/asus-nb-wmi.c

+105 −3
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/input.h>

#include <linux/input.h>

#include <linux/input/sparse-keymap.h>

#include <linux/input/sparse-keymap.h>

#include <linux/fb.h>

#include <linux/fb.h>

#include <linux/dmi.h>





#include "asus-wmi.h"

#include "asus-wmi.h"
@@ -48,18 +49,115 @@ MODULE_ALIAS("wmi:"ASUS_NB_WMI_EVENT_GUID); 
 *  1  | Hardware  | Software

 *  1  | Hardware  | Software

 *  4  | Software  | Software

 *  4  | Software  | Software

 */

 */

static uint wapf;

static int wapf = -1;

module_param(wapf, uint, 0444);

module_param(wapf, uint, 0444);

MODULE_PARM_DESC(wapf, "WAPF value");

MODULE_PARM_DESC(wapf, "WAPF value");





static struct quirk_entry *quirks;



static struct quirk_entry quirk_asus_unknown = {

static struct quirk_entry quirk_asus_unknown = {

	.wapf = 0,

};



static struct quirk_entry quirk_asus_x401u = {

	.wapf = 4,

};



static int dmi_matched(const struct dmi_system_id *dmi)

{

	quirks = dmi->driver_data;

	return 1;

}



static struct dmi_system_id asus_quirks[] = {

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X401U",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X401U"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X401A1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X401A1"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X501U",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X501U"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X501A1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X501A1"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X55A",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X55A"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X55C",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X55C"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X55U",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X55U"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X55VD",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X55VD"),

		},

		.driver_data = &quirk_asus_x401u,

	},

	{},

};

};





static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)

static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)

{

{

	driver->quirks = &quirk_asus_unknown;

	quirks = &quirk_asus_unknown;

	driver->quirks->wapf = wapf;

	dmi_check_system(asus_quirks);



	driver->quirks = quirks;

	driver->panel_power = FB_BLANK_UNBLANK;

	driver->panel_power = FB_BLANK_UNBLANK;



	/* overwrite the wapf setting if the wapf paramater is specified */

	if (wapf != -1)

		quirks->wapf = wapf;

	else

		wapf = quirks->wapf;

}

}





static const struct key_entry asus_nb_wmi_keymap[] = {

static const struct key_entry asus_nb_wmi_keymap[] = {
@@ -94,6 +192,10 @@ static const struct key_entry asus_nb_wmi_keymap[] = { 
	{ KE_KEY, 0x8A, { KEY_PROG1 } },

	{ KE_KEY, 0x8A, { KEY_PROG1 } },

	{ KE_KEY, 0x95, { KEY_MEDIA } },

	{ KE_KEY, 0x95, { KEY_MEDIA } },

	{ KE_KEY, 0x99, { KEY_PHONE } },

	{ KE_KEY, 0x99, { KEY_PHONE } },

	{ KE_KEY, 0xA0, { KEY_SWITCHVIDEOMODE } }, /* SDSP HDMI only */

	{ KE_KEY, 0xA1, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + HDMI */

	{ KE_KEY, 0xA2, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + HDMI */

	{ KE_KEY, 0xA3, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + HDMI */

	{ KE_KEY, 0xb5, { KEY_CALC } },

	{ KE_KEY, 0xb5, { KEY_CALC } },

	{ KE_KEY, 0xc4, { KEY_KBDILLUMUP } },

	{ KE_KEY, 0xc4, { KEY_KBDILLUMUP } },

	{ KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } },

	{ KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } },

CRA Git | Maintained and supported by SUSTech CRA and CCSE