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

Commit 3b6919e5 authored by Len Brown's avatar Len Brown
Browse files

pull asus sony thinkpad into release branch

parents 3864e8cc de47b69c f7b88ccb 9de1cc4a

Documentation/thinkpad-acpi.txt

+2 −2
Original line number Diff line number Diff line
@@ -105,10 +105,10 @@ The version of thinkpad-acpi's sysfs interface is exported by the driver 
as a driver attribute (see below).



Sysfs driver attributes are on the driver's sysfs attribute space,

for 2.6.20 this is /sys/bus/platform/drivers/thinkpad-acpi/.

for 2.6.20 this is /sys/bus/platform/drivers/thinkpad_acpi/.



Sysfs device attributes are on the driver's sysfs attribute space,

for 2.6.20 this is /sys/devices/platform/thinkpad-acpi/.

for 2.6.20 this is /sys/devices/platform/thinkpad_acpi/.



Driver version

--------------

drivers/acpi/asus_acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -1192,6 +1192,7 @@ static int asus_hotk_get_info(void) 
			break;

		default:

			kfree(model);

			model = NULL;

			break;

		}

	}

drivers/char/sonypi.c

+6 −1
Original line number Diff line number Diff line
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type) 
	return 0;

}



const static struct acpi_device_id sonypi_device_ids[] = {

	{"SNY6001", 0},

	{"", 0},

};



static struct acpi_driver sonypi_acpi_driver = {

	.name           = "sonypi",

	.class          = "hkey",

	.ids            = "SNY6001",

	.ids            = sonypi_device_ids,

	.ops            = {

		           .add = sonypi_acpi_add,

			   .remove = sonypi_acpi_remove,

drivers/misc/Kconfig

+15 −7
Original line number Diff line number Diff line
@@ -200,14 +200,22 @@ config THINKPAD_ACPI_BAY 
config THINKPAD_ACPI_INPUT_ENABLED

	bool "Enable input layer support by default"

	depends on THINKPAD_ACPI

	default y

	default n

	---help---

	  Enables hot key handling over the input layer by default.  If unset,

	  the driver does not enable any hot key handling by default, and also

	  starts up with a mostly empty keymap.



	  If you are not sure, say Y here.  Say N to retain the deprecated

	  behavior of ibm-acpi, and thinkpad-acpi for kernels up to 2.6.21.

	  This option enables thinkpad-acpi hot key handling over the input

	  layer at driver load time.  When it is unset, the driver does not

	  enable hot key handling by default, and also starts up with a mostly

	  empty keymap.



	  This option should be enabled if you have a new enough HAL or other

	  userspace support that properly handles the thinkpad-acpi event

	  device.  It auto-tunes the hot key support to those reported by the

	  firmware and enables it automatically.



	  If unsure, say N here to retain the old behaviour of ibm-acpi, and

	  thinkpad-acpi up to kernel 2.6.21: userspace will have to enable and

	  set up the thinkpad-acpi hot key handling using the sysfs interace

	  after loading the driver.





endif # MISC_DEVICES

drivers/misc/sony-laptop.c

+6 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static struct sony_nc_event sony_C_events[] = { 
};



/* SNC-only model map */

struct dmi_system_id sony_nc_ids[] = {

static struct dmi_system_id sony_nc_ids[] = {

		{

			.ident = "Sony Vaio FE Series",

			.callback = sony_nc_C_enable,
@@ -942,6 +942,11 @@ static int sony_nc_resume(struct acpi_device *device) 
		}

	}



	/* set the last requested brightness level */

	if (sony_backlight_device &&

			!sony_backlight_update_status(sony_backlight_device))

		printk(KERN_WARNING DRV_PFX "unable to restore brightness level");



	/* re-initialize models with specific requirements */

	dmi_check_system(sony_nc_ids);