sony-laptop for 2.6.30
Subsystems (3)
Mattia Dongili
maintainercover sony-laptop for 2.6.30
Hi Len,
this patch-set includes the great work done by Matthew Garret to add support for recent Vaio models and better support the old ones too in addition to other smaller changes I had sitting here for a while now.
Hopefully I got the signoffs correctly this time.
drivers/platform/x86/sony-laptop.c | 514 ++++++++++++++++++++++++++--------- include/linux/sonypi.h | 8 + 2 files changed, 390 insertions(+), 132 deletions(-)
Thanks,
-- Mattia
Mattia Dongili
maintainerPATCH 1/14 sony-laptop: Add support for new Sony platform API
From: Matthew Garrett <[email protected]>
Newer Sony Vaios provide a new API for accessing platform functionality. It consists of a set of standardised methods for enabling events and performing queries. These are each identified by a unique handle. This patch adds support for calling functions based on their handle and ports the existing code for these machines over to it.
--- drivers/platform/x86/sony-laptop.c | 146 ++++++++++++++++-------------------- 1 files changed, 65 insertions(+), 81 deletions(-)
drivers/platform/x86/sony-laptop.c +65 -81
@@ -689,6 +689,31 @@ static int acpi_callsetfunc(acpi_handle handle, char *name, int value,return -1 ; } +static int sony_find_snc_handle (int handle) +{ +int i; +int result; + +for (i =0x20 ; i <0x30 ; i++) { +acpi_callsetfunc (sony_nc_acpi_handle,"SN00" , i, &result); +if (result == handle) +return i-0x20 ; + } + +return -1 ; +} + +static int sony_call_snc_handle (int handle,int argument,int *result) +{ +int offset =sony_find_snc_handle (handle); + +if (offset <0 ) +return -1 ; + +return acpi_callsetfunc (sony_nc_acpi_handle,"SN07" , offset | argument, + result); +} +/* * sony_nc_values input/output validate functions */
@@ -809,32 +834,6 @@ struct sony_nc_event {u8 event; }; -static struct sony_nc_event *sony_nc_events; - -/* Vaio C* --maybe also FE*, N* and AR* ?-- special init sequence -* for Fn keys -*/ -static int sony_nc_C_enable (const struct dmi_system_id *id) -{ -int result =0 ; - - printk(KERN_NOTICE DRV_PFX "detected %s\n", id->ident); - - sony_nc_events = id->driver_data; - -if (acpi_callsetfunc (sony_nc_acpi_handle,"SN02" ,0x4 , &result) <0 - ||acpi_callsetfunc (sony_nc_acpi_handle,"SN07" ,0x2 , &result) <0 - ||acpi_callsetfunc (sony_nc_acpi_handle,"SN02" ,0x10 , &result) <0 - ||acpi_callsetfunc (sony_nc_acpi_handle,"SN07" ,0x0 , &result) <0 - ||acpi_callsetfunc (sony_nc_acpi_handle,"SN03" ,0x2 , &result) <0 - ||acpi_callsetfunc (sony_nc_acpi_handle,"SN07" ,0x101 , &result) <0 ) { - printk(KERN_WARNING DRV_PFX "failed to initialize SNC, some " - "functionalities may be missing\n"); -return 1 ; - } -return 0 ; -} -static struct sony_nc_event sony_C_events[] = { {0x81 ,SONYPI_EVENT_FNKEY_F1 }, {0x01 ,SONYPI_EVENT_FNKEY_RELEASED },
@@ -851,57 +850,17 @@ static struct sony_nc_event sony_C_events[] = { { 0, 0 }, }; -/* SNC-only model map */ -static const struct dmi_system_id sony_nc_ids[] = { - { - .ident ="Sony Vaio FE Series" , - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), -DMI_MATCH (DMI_PRODUCT_NAME ,"VGN-FE" ), - }, - }, - { - .ident ="Sony Vaio FZ Series" , - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), -DMI_MATCH (DMI_PRODUCT_NAME ,"VGN-FZ" ), - }, - }, - { - .ident ="Sony Vaio C Series" , - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), -DMI_MATCH (DMI_PRODUCT_NAME ,"VGN-C" ), - }, - }, - { - .ident ="Sony Vaio N Series" , - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), -DMI_MATCH (DMI_PRODUCT_NAME ,"VGN-N" ), - }, - }, - { } -}; -/* * ACPI callbacks */ static void sony_acpi_notify (acpi_handle handle,u32 event,void *data) { -struct sony_nc_event *evmap; +int i;u32 ev = event;int result; -if (ev ==0x92 ) { +if (ev ==0x92 || ev ==0x90 ) { +int origev = ev;/* read the key pressed from EC.GECR * A call to SN07 with 0x0202 will do it as well respecting * the current protocol on different OSes
@@ -913,20 +872,23 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)* TODO: we may want to do the same for the older GHKE -need * dmi list- so this snippet may become one more callback. */ -if (acpi_callsetfunc (handle,"SN07" ,0x0202 , &result) <0 ) +if (sony_call_snc_handle (0x100 ,0x200 , &result))dprintk ("sony_acpi_notify, unable to decode event 0x%.2x\n" , ev);else ev = result &0xFF ; - } -if (sony_nc_events) -for (evmap = sony_nc_events; evmap->event; evmap++) { -if (evmap->data == ev) { - ev = evmap->event; +for (i =0 ; sony_C_events[i].data; i++) { +if (sony_C_events[i].data == ev) { + ev = sony_C_events[i].event;break ; } } +if (!sony_C_events[i].data) + printk(KERN_INFO DRV_PFX "Unknown event: %x %x\n", + origev, ev); + } +dprintk ("sony_acpi_notify, event: 0x%.2x\n" , ev);sony_laptop_report_input_event (ev);acpi_bus_generate_proc_event (sony_nc_acpi_device,1 , ev);
@@ -953,9 +915,25 @@ static acpi_status sony_walk_callback(acpi_handle handle, u32 level,/* * ACPI device */ +static int sony_nc_function_setup (struct acpi_device *device) +{ +int result; + +/* Enable all events */ +acpi_callsetfunc (sony_nc_acpi_handle,"SN02" ,0xffff , &result); + +/* Setup hotkeys */ +sony_call_snc_handle (0x0100 ,0 , &result); +sony_call_snc_handle (0x0101 ,0 , &result); +sony_call_snc_handle (0x0102 ,0x100 , &result); + +return 0 ; +} +static int sony_nc_resume (struct acpi_device *device) {struct sony_nc_value *item; +acpi_handle handle;for (item = sony_nc_values; item->name; item++) {int ret;
@@ -970,14 +948,17 @@ static int sony_nc_resume(struct acpi_device *device) } } +if (ACPI_SUCCESS (acpi_get_handle (sony_nc_acpi_handle,"SN00" , + &handle))) { +dprintk ("Doing SNC setup\n" ); +sony_nc_function_setup (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\n"); -/* re-initialize models with specific requirements */ -dmi_check_system (sony_nc_ids); -return 0 ; }
@@ -1024,6 +1005,12 @@ static int sony_nc_add(struct acpi_device *device)dprintk ("_INI Method failed\n" ); } +if (ACPI_SUCCESS (acpi_get_handle (sony_nc_acpi_handle,"SN00" , + &handle))) { +dprintk ("Doing SNC setup\n" ); +sony_nc_function_setup (device); + } +/* setup input devices and helper fifo */ result =sony_laptop_setup_input (device);if (result) {
@@ -1063,9 +1050,6 @@ static int sony_nc_add(struct acpi_device *device) } -/* initialize models with specific requirements */ -dmi_check_system (sony_nc_ids); - result =sony_pf_add ();if (result) goto outbacklight;
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 2/14 sony-laptop: Enable EC on newer hardware
From: Matthew Garrett <[email protected]>
The latest Vaios can execute certain codepaths in two ways - either using system management mode or using pure ACPI methods. The latter is only used if the OS has called the ECON method. Ensure that this is done where the method is available.
--- drivers/platform/x86/sony-laptop.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/platform/x86/sony-laptop.c +12 -0
@@ -948,6 +948,12 @@ static int sony_nc_resume(struct acpi_device *device) } } +if (ACPI_SUCCESS (acpi_get_handle (sony_nc_acpi_handle,"ECON" , + &handle))) { +if (acpi_callsetfunc (sony_nc_acpi_handle,"ECON" ,1 ,NULL )) +dprintk ("ECON Method failed\n" ); + } +if (ACPI_SUCCESS (acpi_get_handle (sony_nc_acpi_handle,"SN00" , &handle))) {dprintk ("Doing SNC setup\n" );
@@ -1005,6 +1011,12 @@ static int sony_nc_add(struct acpi_device *device)dprintk ("_INI Method failed\n" ); } +if (ACPI_SUCCESS (acpi_get_handle (sony_nc_acpi_handle,"ECON" , + &handle))) { +if (acpi_callsetfunc (sony_nc_acpi_handle,"ECON" ,1 ,NULL )) +dprintk ("ECON Method failed\n" ); + } +if (ACPI_SUCCESS (acpi_get_handle (sony_nc_acpi_handle,"SN00" , &handle))) {dprintk ("Doing SNC setup\n" );
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 3/14 sony-laptop: Add support for extra keyboard events
From: Matthew Garrett <[email protected]>
The current sony-laptop code assumes that the keyboard event method is always located at slot 2 in the platform code. Remove this assumption and add support for some additional hotkeys.
--- drivers/platform/x86/sony-laptop.c | 61 +++++++++++++++++++---------------- include/linux/sonypi.h | 1 + 2 files changed, 34 insertions(+), 28 deletions(-)
drivers/platform/x86/sony-laptop.c +32 -27
@@ -211,6 +211,7 @@ static int sony_laptop_input_index[] = {48 ,/* 61 SONYPI_EVENT_WIRELESS_OFF */ 49 ,/* 62 SONYPI_EVENT_ZOOM_IN_PRESSED */ 50 ,/* 63 SONYPI_EVENT_ZOOM_OUT_PRESSED */ + 51, /* 64 SONYPI_EVENT_CD_EJECT_PRESSED */ }; static int sony_laptop_input_keycode_map[] = {
@@ -264,7 +265,8 @@ static int sony_laptop_input_keycode_map[] = {KEY_WLAN ,/* 47 SONYPI_EVENT_WIRELESS_ON */ KEY_WLAN ,/* 48 SONYPI_EVENT_WIRELESS_OFF */ KEY_ZOOMIN ,/* 49 SONYPI_EVENT_ZOOM_IN_PRESSED */ - KEY_ZOOMOUT /* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */ +KEY_ZOOMOUT ,/* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */ + KEY_EJECTCD /* 51 SONYPI_EVENT_CD_EJECT_PRESSED */ };/* release buttons after a short delay if pressed */
@@ -834,7 +836,11 @@ struct sony_nc_event {u8 event; }; -static struct sony_nc_event sony_C_events[] = { +static struct sony_nc_event sony_nc_events[] = { + {0x90 ,SONYPI_EVENT_PKEY_P1 }, + {0x10 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x91 ,SONYPI_EVENT_PKEY_P1 }, + {0x11 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, {0x81 ,SONYPI_EVENT_FNKEY_F1 }, {0x01 ,SONYPI_EVENT_FNKEY_RELEASED }, {0x85 ,SONYPI_EVENT_FNKEY_F5 },
@@ -843,10 +849,14 @@ static struct sony_nc_event sony_C_events[] = { { 0x06, SONYPI_EVENT_FNKEY_RELEASED }, { 0x87, SONYPI_EVENT_FNKEY_F7 }, { 0x07, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x89, SONYPI_EVENT_FNKEY_F9 }, + { 0x09, SONYPI_EVENT_FNKEY_RELEASED }, { 0x8A, SONYPI_EVENT_FNKEY_F10 }, { 0x0A, SONYPI_EVENT_FNKEY_RELEASED }, { 0x8C, SONYPI_EVENT_FNKEY_F12 }, { 0x0C, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x9f, SONYPI_EVENT_CD_EJECT_PRESSED }, + { 0x1f, SONYPI_EVENT_ANYBUTTON_RELEASED }, { 0, 0 }, };
@@ -855,38 +865,33 @@ static struct sony_nc_event sony_C_events[] = {*/ static void sony_acpi_notify (acpi_handle handle,u32 event,void *data) { -int i;u32 ev = event;int result; -if (ev ==0x92 || ev ==0x90 ) { +if (ev >=0x90 ) { +/* New-style event */ int origev = ev; -/* read the key pressed from EC.GECR -* A call to SN07 with 0x0202 will do it as well respecting -* the current protocol on different OSes -* -* Note: the path for GECR may be -* \_SB.PCI0.LPCB.EC (C, FE, AR, N and friends) -* \_SB.PCI0.PIB.EC0 (VGN-FR notifications are sent directly, no GECR) -* -* TODO: we may want to do the same for the older GHKE -need -* dmi list- so this snippet may become one more callback. -*/ -if (sony_call_snc_handle (0x100 ,0x200 , &result)) -dprintk ("sony_acpi_notify, unable to decode event 0x%.2x\n" , ev); -else - ev = result &0xFF ; + ev -=0x90 ; -for (i =0 ; sony_C_events[i].data; i++) { -if (sony_C_events[i].data == ev) { - ev = sony_C_events[i].event; -break ; +if (sony_find_snc_handle (0x100 ) == ev) { +int i; + +if (sony_call_snc_handle (0x100 ,0x200 , &result)) +dprintk ("sony_acpi_notify, unable to decode event 0x%.2x\n" , ev); +else + ev = result &0xFF ; + +for (i =0 ; sony_nc_events[i].event; i++) { +if (sony_nc_events[i].data == ev) { + ev = sony_nc_events[i].event; +break ; + } } - } -if (!sony_C_events[i].data) - printk(KERN_INFO DRV_PFX "Unknown event: %x %x\n", - origev, ev); +if (!sony_nc_events[i].data) + printk(KERN_INFO DRV_PFX +"Unknown event: %x %x\n" , origev, ev); + } }dprintk ("sony_acpi_notify, event: 0x%.2x\n" , ev);
include/linux/sonypi.h +1 -0
@@ -103,6 +103,7 @@#define SONYPI_EVENT_WIRELESS_OFF 61#define SONYPI_EVENT_ZOOM_IN_PRESSED 62#define SONYPI_EVENT_ZOOM_OUT_PRESSED 63 +#define SONYPI_EVENT_CD_EJECT_PRESSED 64/* get/set brightness */ #define SONYPI_IOCGBRT _IOR('v', 0, __u8)
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 4/14 sony-laptop: Add rfkill support on new models
From: Matthew Garrett <[email protected]>
Newer Vaios provide a full featured rfkill implementation via their platform methods. Add support for enumerating the available devices and providing rfkill access to them. Support for the physical kill switch is added, with the devices moving into the HARD_BLOCKED state when toggled.
--- drivers/platform/x86/sony-laptop.c | 186 ++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-)
drivers/platform/x86/sony-laptop.c +186 -0
@@ -64,6 +64,7 @@#include <asm/uaccess.h> #include <linux/sonypi.h> #include <linux/sony-laptop.h> +#include <linux/rfkill.h> #ifdef CONFIG_SONYPI_COMPAT #include <linux/poll.h> #include <linux/miscdevice.h>
@@ -123,6 +124,18 @@ MODULE_PARM_DESC(minor, "default is -1 (automatic)");#endif +enum sony_nc_rfkill { +SONY_WIFI , +SONY_BLUETOOTH , +SONY_WWAN , +SONY_WIMAX , +SONY_RFKILL_MAX , +}; + +static struct rfkill *sony_rfkill_devices[SONY_RFKILL_MAX ]; +static int sony_rfkill_address[SONY_RFKILL_MAX ] = {0x300 ,0x500 ,0x700 ,0x900 }; +static void sony_nc_rfkill_update (void ); +/*********** Input Devices ***********/ #define SONY_LAPTOP_BUF_SIZE 128
@@ -134,6 +147,7 @@ struct sony_laptop_input_s {spinlock_t fifo_lock;struct workqueue_struct *wq; }; +static struct sony_laptop_input_s sony_laptop_input = { .users =ATOMIC_INIT (0 ), };
@@ -891,6 +905,9 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)if (!sony_nc_events[i].data) printk(KERN_INFO DRV_PFX"Unknown event: %x %x\n" , origev, ev); + }else if (sony_find_snc_handle (0x124 ) == ev) { +sony_nc_rfkill_update (); +return ; } }
@@ -973,6 +990,172 @@ static int sony_nc_resume(struct acpi_device *device)return 0 ; } +static void sony_nc_rfkill_cleanup (void ) +{ +int i; + +for (i =0 ; i <SONY_RFKILL_MAX ; i++) { +if (sony_rfkill_devices[i]) +rfkill_unregister (sony_rfkill_devices[i]); + } +} + +static int sony_nc_rfkill_get (void *data,enum rfkill_state *state) +{ +int result; +int argument = sony_rfkill_address[(long ) data]; + +sony_call_snc_handle (0x124 ,0x200 , &result); +if (result &0x1 ) { +sony_call_snc_handle (0x124 , argument, &result); +if (result &0xf ) + *state =RFKILL_STATE_UNBLOCKED ; +else + *state =RFKILL_STATE_SOFT_BLOCKED ; + }else { + *state =RFKILL_STATE_HARD_BLOCKED ; + } + +return 0 ; +} + +static int sony_nc_rfkill_set (void *data,enum rfkill_state state) +{ +int result; +int argument = sony_rfkill_address[(long ) data] +0x100 ; + +if (state ==RFKILL_STATE_UNBLOCKED ) + argument |=0xff0000 ; + +return sony_call_snc_handle (0x124 , argument, &result); +} + +static int sony_nc_setup_wifi_rfkill (struct acpi_device *device) +{ +int err =0 ; +struct rfkill *sony_wifi_rfkill; + + sony_wifi_rfkill =rfkill_allocate (&device->dev,RFKILL_TYPE_WLAN ); +if (!sony_wifi_rfkill) +return -1 ; + sony_wifi_rfkill->name ="sony-wifi" ; + sony_wifi_rfkill->toggle_radio = sony_nc_rfkill_set; + sony_wifi_rfkill->get_state = sony_nc_rfkill_get; + sony_wifi_rfkill->user_claim_unsupported =1 ; + sony_wifi_rfkill->data = (void *)SONY_WIFI ; + err =rfkill_register (sony_wifi_rfkill); +if (err) +rfkill_free (sony_wifi_rfkill); +else + sony_rfkill_devices[SONY_WIFI ] = sony_wifi_rfkill; +return err; +} + +static int sony_nc_setup_bluetooth_rfkill (struct acpi_device *device) +{ +int err =0 ; +struct rfkill *sony_bluetooth_rfkill; + + sony_bluetooth_rfkill =rfkill_allocate (&device->dev, +RFKILL_TYPE_BLUETOOTH ); +if (!sony_bluetooth_rfkill) +return -1 ; + sony_bluetooth_rfkill->name ="sony-bluetooth" ; + sony_bluetooth_rfkill->toggle_radio = sony_nc_rfkill_set; + sony_bluetooth_rfkill->get_state = sony_nc_rfkill_get; + sony_bluetooth_rfkill->user_claim_unsupported =1 ; + sony_bluetooth_rfkill->data = (void *)SONY_BLUETOOTH ; + err =rfkill_register (sony_bluetooth_rfkill); +if (err) +rfkill_free (sony_bluetooth_rfkill); +else + sony_rfkill_devices[SONY_BLUETOOTH ] = sony_bluetooth_rfkill; +return err; +} + +static int sony_nc_setup_wwan_rfkill (struct acpi_device *device) +{ +int err =0 ; +struct rfkill *sony_wwan_rfkill; + + sony_wwan_rfkill =rfkill_allocate (&device->dev,RFKILL_TYPE_WWAN ); +if (!sony_wwan_rfkill) +return -1 ; + sony_wwan_rfkill->name ="sony-wwan" ; + sony_wwan_rfkill->toggle_radio = sony_nc_rfkill_set; + sony_wwan_rfkill->get_state = sony_nc_rfkill_get; + sony_wwan_rfkill->user_claim_unsupported =1 ; + sony_wwan_rfkill->data = (void *)SONY_WWAN ; + err =rfkill_register (sony_wwan_rfkill); +if (err) +rfkill_free (sony_wwan_rfkill); +else + sony_rfkill_devices[SONY_WWAN ] = sony_wwan_rfkill; +return err; +} + +static int sony_nc_setup_wimax_rfkill (struct acpi_device *device) +{ +int err =0 ; +struct rfkill *sony_wimax_rfkill; + + sony_wimax_rfkill =rfkill_allocate (&device->dev,RFKILL_TYPE_WIMAX ); +if (!sony_wimax_rfkill) +return -1 ; + sony_wimax_rfkill->name ="sony-wimax" ; + sony_wimax_rfkill->toggle_radio = sony_nc_rfkill_set; + sony_wimax_rfkill->get_state = sony_nc_rfkill_get; + sony_wimax_rfkill->user_claim_unsupported =1 ; + sony_wimax_rfkill->data = (void *)SONY_WIMAX ; + err =rfkill_register (sony_wimax_rfkill); +if (err) +rfkill_free (sony_wimax_rfkill); +else + sony_rfkill_devices[SONY_WIMAX ] = sony_wimax_rfkill; +return err; +} + +static void sony_nc_rfkill_update () +{ +int i; +enum rfkill_state state; + +for (i =0 ; i <SONY_RFKILL_MAX ; i++) { +if (sony_rfkill_devices[i]) { + sony_rfkill_devices[i]-> +get_state (sony_rfkill_devices[i]->data, + &state); +rfkill_force_state (sony_rfkill_devices[i], state); + } + } +} + +static int sony_nc_rfkill_setup (struct acpi_device *device) +{ +int result, ret; + +if (sony_find_snc_handle (0x124 ) ==-1 ) +return -1 ; + + ret =sony_call_snc_handle (0x124 ,0xb00 , &result); +if (ret) { + printk(KERN_INFO DRV_PFX + "Unable to enumerate rfkill devices: %x\n", ret); +return ret; + } + +if (result &0x1 ) +sony_nc_setup_wifi_rfkill (device); +if (result &0x2 ) +sony_nc_setup_bluetooth_rfkill (device); +if (result &0x1c ) +sony_nc_setup_wwan_rfkill (device); +if (result &0x20 ) +sony_nc_setup_wimax_rfkill (device); + +return 0 ; +} +static int sony_nc_add (struct acpi_device *device) {acpi_status status;
@@ -1026,6 +1209,7 @@ static int sony_nc_add(struct acpi_device *device) &handle))) {dprintk ("Doing SNC setup\n" );sony_nc_function_setup (device); +sony_nc_rfkill_setup (device); }/* setup input devices and helper fifo */
@@ -1132,6 +1316,7 @@ static int sony_nc_add(struct acpi_device *device)sony_laptop_remove_input (); outwalk: +sony_nc_rfkill_cleanup ();return result; }
@@ -1157,6 +1342,7 @@ static int sony_nc_remove(struct acpi_device *device, int type)sony_pf_remove ();sony_laptop_remove_input (); +sony_nc_rfkill_cleanup ();dprintk (SONY_NC_DRIVER_NAME " removed.\n" );return 0 ;
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 5/14 sony-laptop: Add support for extended hotkeys
From: Matthew Garrett <[email protected]>
Recent Sony SR-series machines have an additional set of buttons accessed via the 0x127 method rather than the 0x100 method. Add support for these.
--- drivers/platform/x86/sony-laptop.c | 65 +++++++++++++++++++++++++++++------- include/linux/sonypi.h | 4 ++ 2 files changed, 57 insertions(+), 12 deletions(-)
drivers/platform/x86/sony-laptop.c +53 -12
@@ -226,6 +226,10 @@ static int sony_laptop_input_index[] = {49 ,/* 62 SONYPI_EVENT_ZOOM_IN_PRESSED */ 50 ,/* 63 SONYPI_EVENT_ZOOM_OUT_PRESSED */ 51 ,/* 64 SONYPI_EVENT_CD_EJECT_PRESSED */ +52 ,/* 65 SONYPI_EVENT_MODEKEY_PRESSED */ +53 ,/* 66 SONYPI_EVENT_PKEY_P4 */ +54 ,/* 67 SONYPI_EVENT_PKEY_P5 */ + 55, /* 68 SONYPI_EVENT_SETTINGKEY_PRESSED */ }; static int sony_laptop_input_keycode_map[] = {
@@ -280,7 +284,11 @@ static int sony_laptop_input_keycode_map[] = {KEY_WLAN ,/* 48 SONYPI_EVENT_WIRELESS_OFF */ KEY_ZOOMIN ,/* 49 SONYPI_EVENT_ZOOM_IN_PRESSED */ KEY_ZOOMOUT ,/* 50 SONYPI_EVENT_ZOOM_OUT_PRESSED */ - KEY_EJECTCD /* 51 SONYPI_EVENT_CD_EJECT_PRESSED */ +KEY_EJECTCD ,/* 51 SONYPI_EVENT_CD_EJECT_PRESSED */ +KEY_F13 ,/* 52 SONYPI_EVENT_MODEKEY_PRESSED */ +KEY_PROG4 ,/* 53 SONYPI_EVENT_PKEY_P4 */ +KEY_F14 ,/* 54 SONYPI_EVENT_PKEY_P5 */ + KEY_F15, /* 55 SONYPI_EVENT_SETTINGKEY_PRESSED */ };/* release buttons after a short delay if pressed */
@@ -850,7 +858,7 @@ struct sony_nc_event {u8 event; }; -static struct sony_nc_event sony_nc_events[] = { +static struct sony_nc_event sony_100_events[] = { {0x90 ,SONYPI_EVENT_PKEY_P1 }, {0x10 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, {0x91 ,SONYPI_EVENT_PKEY_P1 },
@@ -874,6 +882,25 @@ static struct sony_nc_event sony_nc_events[] = { { 0, 0 }, }; +static struct sony_nc_event sony_127_events[] = { + {0x81 ,SONYPI_EVENT_MODEKEY_PRESSED }, + {0x01 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x82 ,SONYPI_EVENT_PKEY_P1 }, + {0x02 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x83 ,SONYPI_EVENT_PKEY_P2 }, + {0x03 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x84 ,SONYPI_EVENT_PKEY_P3 }, + {0x04 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x85 ,SONYPI_EVENT_PKEY_P4 }, + {0x05 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x86 ,SONYPI_EVENT_PKEY_P5 }, + {0x06 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x06 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0x87 ,SONYPI_EVENT_SETTINGKEY_PRESSED }, + {0x07 ,SONYPI_EVENT_ANYBUTTON_RELEASED }, + {0 ,0 }, +}; +/* * ACPI callbacks */
@@ -884,27 +911,41 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)if (ev >=0x90 ) {/* New-style event */ -int origev = ev; +int key_handle =0 ; ev -=0x90 ; -if (sony_find_snc_handle (0x100 ) == ev) { -int i; +if (sony_find_snc_handle (0x100 ) == ev) + key_handle =0x100 ; +if (sony_find_snc_handle (0x127 ) == ev) + key_handle =0x127 ; + +if (handle) { +struct sony_nc_event *key_event; -if (sony_call_snc_handle (0x100 ,0x200 , &result)) -dprintk ("sony_acpi_notify, unable to decode event 0x%.2x\n" , ev); +if (sony_call_snc_handle (key_handle,0x200 , &result)) +dprintk ("sony_acpi_notify, unable to decode" +" event 0x%.2x 0x%.2x\n" , key_handle, + ev);else ev = result &0xFF ; -for (i =0 ; sony_nc_events[i].event; i++) { -if (sony_nc_events[i].data == ev) { - ev = sony_nc_events[i].event; +if (key_handle ==0x100 ) + key_event = sony_100_events; +else + key_event = sony_127_events; + +for (; key_event->data; key_event++) { +if (key_event->data == ev) { + ev = key_event->event;break ; } } -if (!sony_nc_events[i].data) +if (!key_event->data) { printk(KERN_INFO DRV_PFX -"Unknown event: %x %x\n" , origev, ev); +"Unknown event: 0x%x 0x%x\n" , key_handle, + ev); + } }else if (sony_find_snc_handle (0x124 ) == ev) {sony_nc_rfkill_update ();return ;
include/linux/sonypi.h +4 -0
@@ -104,6 +104,10 @@#define SONYPI_EVENT_ZOOM_IN_PRESSED 62#define SONYPI_EVENT_ZOOM_OUT_PRESSED 63#define SONYPI_EVENT_CD_EJECT_PRESSED 64 +#define SONYPI_EVENT_MODEKEY_PRESSED 65 +#define SONYPI_EVENT_PKEY_P4 66 +#define SONYPI_EVENT_PKEY_P5 67 +#define SONYPI_EVENT_SETTINGKEY_PRESSED 68/* get/set brightness */ #define SONYPI_IOCGBRT _IOR('v', 0, __u8)
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 6/14 sony-laptop: merge Type4 into Type3
Creating Type4 was a mistake in the first place. Some users report that also Type3 vaios require the same extra hotkey handling which the Type4 for was menat to guard from.
Merging down Type4 into Type3 will just remove a useless distinction.
--- drivers/platform/x86/sony-laptop.c | 28 ++++++---------------------- 1 files changed, 6 insertions(+), 22 deletions(-)
drivers/platform/x86/sony-laptop.c +6 -22
@@ -1423,7 +1423,6 @@ static struct acpi_driver sony_nc_driver = {#define SONYPI_TYPE1_OFFSET 0x04#define SONYPI_TYPE2_OFFSET 0x12#define SONYPI_TYPE3_OFFSET 0x12 -#define SONYPI_TYPE4_OFFSET 0x12struct sony_pic_ioport {struct acpi_resource_io io1;
@@ -1666,14 +1665,6 @@ static struct sonypi_eventtypes type3_events[] = { { 0x31, SONYPI_MEMORYSTICK_MASK, sonypi_memorystickev }, { 0x41, SONYPI_BATTERY_MASK, sonypi_batteryev }, { 0x31, SONYPI_PKEY_MASK, sonypi_pkeyev }, - { 0 }, -}; -static struct sonypi_eventtypes type4_events[] = { - {0 ,0xffffffff , sonypi_releaseev }, - {0x21 ,SONYPI_FNKEY_MASK , sonypi_fnkeyev }, - {0x31 ,SONYPI_WIRELESS_MASK , sonypi_wlessev }, - {0x31 ,SONYPI_MEMORYSTICK_MASK , sonypi_memorystickev }, - {0x41 ,SONYPI_BATTERY_MASK , sonypi_batteryev }, { 0x05, SONYPI_PKEY_MASK, sonypi_pkeyev }, { 0x05, SONYPI_ZOOM_MASK, sonypi_zoomev }, { 0x05, SONYPI_CAPTURE_MASK, sonypi_captureev },
@@ -1739,11 +1730,11 @@ static u8 sony_pic_call3(u8 dev, u8 fn, u8 v)/* * minidrivers for SPIC models */ -static int type4_handle_irq (const u8 data_mask,const u8 ev) +static int type3_handle_irq (const u8 data_mask,const u8 ev) {/* * 0x31 could mean we have to take some extra action and wait for -* the next irq for some Type4 models, it will generate a new +* the next irq for some Type3 models, it will generate a new * irq and we can read new data from the device: * - 0x5c and 0x5f requires 0xA0 * - 0x61 requires 0xB3
@@ -1773,16 +1764,10 @@ static struct device_ctrl spic_types[] = { }, { .model = SONYPI_DEVICE_TYPE3, - .handle_irq = NULL, + .handle_irq = type3_handle_irq, .evport_offset = SONYPI_TYPE3_OFFSET, .event_types = type3_events, }, - { - .model = SONYPI_DEVICE_TYPE4, - .handle_irq = type4_handle_irq, - .evport_offset = SONYPI_TYPE4_OFFSET, - .event_types = type4_events, - }, };static void sony_pic_detect_device_type (struct sony_pic_dev *dev)
@@ -1806,14 +1791,14 @@ static void sony_pic_detect_device_type(struct sony_pic_dev *dev) pcidev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH7_1 ,NULL );if (pcidev) { - dev->control = &spic_types[3 ]; + dev->control = &spic_types[2 ]; goto out; } pcidev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_ICH8_4 ,NULL );if (pcidev) { - dev->control = &spic_types[3 ]; + dev->control = &spic_types[2 ]; goto out; }
@@ -1826,8 +1811,7 @@ out: printk(KERN_INFO DRV_PFX "detected Type%d model\n", dev->control->model ==SONYPI_DEVICE_TYPE1 ?1 : - dev->control->model ==SONYPI_DEVICE_TYPE2 ?2 : - dev->control->model == SONYPI_DEVICE_TYPE3 ? 3 : 4); + dev->control->model == SONYPI_DEVICE_TYPE2 ? 2 : 3); }/* camera tests and poweron/poweroff */
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 7/14 sony-laptop: VGN-A317M hotkey support
From: Harald Jenny <[email protected]>
This laptop has 5 SPIC managed buttons above the keyboard:
sound + and - as well as brightness, zoom and S1. Possibly the entire VGN-A serie behaves the same.
--- drivers/platform/x86/sony-laptop.c | 22 ++++++++++++++++++++++ include/linux/sonypi.h | 3 +++ 2 files changed, 25 insertions(+), 0 deletions(-)
drivers/platform/x86/sony-laptop.c +22 -0
@@ -230,6 +230,9 @@ static int sony_laptop_input_index[] = {53 ,/* 66 SONYPI_EVENT_PKEY_P4 */ 54 ,/* 67 SONYPI_EVENT_PKEY_P5 */ 55 ,/* 68 SONYPI_EVENT_SETTINGKEY_PRESSED */ +56 ,/* 69 SONYPI_EVENT_VOLUME_INC_PRESSED */ +57 ,/* 70 SONYPI_EVENT_VOLUME_DEC_PRESSED */ + -1, /* 71 SONYPI_EVENT_BRIGHTNESS_PRESSED */ }; static int sony_laptop_input_keycode_map[] = {
@@ -289,6 +292,8 @@ static int sony_laptop_input_keycode_map[] = {KEY_PROG4 ,/* 53 SONYPI_EVENT_PKEY_P4 */ KEY_F14 ,/* 54 SONYPI_EVENT_PKEY_P5 */ KEY_F15 ,/* 55 SONYPI_EVENT_SETTINGKEY_PRESSED */ +KEY_VOLUMEUP ,/* 56 SONYPI_EVENT_VOLUME_INC_PRESSED */ + KEY_VOLUMEDOWN, /* 57 SONYPI_EVENT_VOLUME_DEC_PRESSED */ };/* release buttons after a short delay if pressed */
@@ -1555,6 +1560,7 @@ static struct sonypi_event sonypi_pkeyev[] = { { 0x01, SONYPI_EVENT_PKEY_P1 }, { 0x02, SONYPI_EVENT_PKEY_P2 }, { 0x04, SONYPI_EVENT_PKEY_P3 }, + { 0x20, SONYPI_EVENT_PKEY_P1 }, { 0, 0 } };
@@ -1598,6 +1604,7 @@ static struct sonypi_event sonypi_zoomev[] = { { 0x39, SONYPI_EVENT_ZOOM_PRESSED }, { 0x10, SONYPI_EVENT_ZOOM_IN_PRESSED }, { 0x20, SONYPI_EVENT_ZOOM_OUT_PRESSED }, + { 0x04, SONYPI_EVENT_ZOOM_PRESSED }, { 0, 0 } };
@@ -1628,6 +1635,19 @@ static struct sonypi_event sonypi_batteryev[] = { { 0, 0 } }; +/* The set of possible volume events */ +static struct sonypi_event sonypi_volumeev[] = { + {0x01 ,SONYPI_EVENT_VOLUME_INC_PRESSED }, + {0x02 ,SONYPI_EVENT_VOLUME_DEC_PRESSED }, + {0 ,0 } +}; + +/* The set of possible brightness events */ +static struct sonypi_event sonypi_brightnessev[] = { + {0x80 ,SONYPI_EVENT_BRIGHTNESS_PRESSED }, + {0 ,0 } +}; +static struct sonypi_eventtypes type1_events[] = { {0 ,0xffffffff , sonypi_releaseev }, {0x70 ,SONYPI_MEYE_MASK , sonypi_meyeev },
@@ -1668,6 +1688,8 @@ static struct sonypi_eventtypes type3_events[] = { { 0x05, SONYPI_PKEY_MASK, sonypi_pkeyev }, { 0x05, SONYPI_ZOOM_MASK, sonypi_zoomev }, { 0x05, SONYPI_CAPTURE_MASK, sonypi_captureev }, + { 0x05, SONYPI_PKEY_MASK, sonypi_volumeev }, + { 0x05, SONYPI_PKEY_MASK, sonypi_brightnessev }, { 0 }, };
include/linux/sonypi.h +3 -0
@@ -108,6 +108,9 @@#define SONYPI_EVENT_PKEY_P4 66#define SONYPI_EVENT_PKEY_P5 67#define SONYPI_EVENT_SETTINGKEY_PRESSED 68 +#define SONYPI_EVENT_VOLUME_INC_PRESSED 69 +#define SONYPI_EVENT_VOLUME_DEC_PRESSED 70 +#define SONYPI_EVENT_BRIGHTNESS_PRESSED 71/* get/set brightness */ #define SONYPI_IOCGBRT _IOR('v', 0, __u8)
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 8/14 sony-laptop: Eliminate BKL in ioctls
From: Alan Cox <[email protected]>
--- drivers/platform/x86/sony-laptop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/sony-laptop.c +3 -3
@@ -2224,8 +2224,8 @@ static int ec_read16(u8 addr, u16 *value)return 0 ; } -static int sonypi_misc_ioctl (struct inode *ip,struct file *fp, -unsigned int cmd,unsigned long arg) +static long sonypi_misc_ioctl (struct file *fp,unsigned int cmd, +unsigned long arg) {int ret =0 ;void __user *argp = (void __user *)arg;
@@ -2359,7 +2359,7 @@ static const struct file_operations sonypi_misc_fops = { .open = sonypi_misc_open, .release = sonypi_misc_release, .fasync = sonypi_misc_fasync, - .ioctl = sonypi_misc_ioctl, + .unlocked_ioctl = sonypi_misc_ioctl, };static struct miscdevice sonypi_misc_device = {
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 9/14 sony-laptop: detect the ICH9 chipset as Type3
From: ISHIKAWA Mutsumi <[email protected]>
--- drivers/platform/x86/sony-laptop.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/platform/x86/sony-laptop.c +7 -0
@@ -1824,6 +1824,13 @@ static void sony_pic_detect_device_type(struct sony_pic_dev *dev) goto out; } + pcidev =pci_get_device (PCI_VENDOR_ID_INTEL , +PCI_DEVICE_ID_INTEL_ICH9_1 ,NULL ); +if (pcidev) { + dev->control = &spic_types[2 ]; + goto out; + } +/* default */ dev->control = &spic_types[1 ];
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 10/14 sony-laptop: notify the hardware of a state change in wwanpower
From: Sergey Yanovich <[email protected]>
--- drivers/platform/x86/sony-laptop.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/platform/x86/sony-laptop.c +1 -0
@@ -2004,6 +2004,7 @@ static void sony_pic_set_wwanpower(u8 state)return ; }sony_pic_call2 (0xB0 , state); +sony_pic_call1 (0x82 ); spic_dev.wwan_power = state;mutex_unlock (&spic_dev.lock); }
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 11/14 sony-laptop: Add FW specific hotkey events and DMI
From: Anton Veretenenko <[email protected]>
--- drivers/platform/x86/sony-laptop.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/platform/x86/sony-laptop.c +6 -0
@@ -870,6 +870,12 @@ static struct sony_nc_event sony_100_events[] = { { 0x11, SONYPI_EVENT_ANYBUTTON_RELEASED }, { 0x81, SONYPI_EVENT_FNKEY_F1 }, { 0x01, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x82, SONYPI_EVENT_FNKEY_F2 }, + { 0x02, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x83, SONYPI_EVENT_FNKEY_F3 }, + { 0x03, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x84, SONYPI_EVENT_FNKEY_F4 }, + { 0x04, SONYPI_EVENT_FNKEY_RELEASED }, { 0x85, SONYPI_EVENT_FNKEY_F5 }, { 0x05, SONYPI_EVENT_FNKEY_RELEASED }, { 0x86, SONYPI_EVENT_FNKEY_F6 },
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 12/14 sony-laptop: Make sony_pic_set_wwanpower not take mutexes
For consistency with __sony_pic_set_bluetoothpower, this is also needed later to allow setting the wwanpower attribute from the resume path and only lock the mutex once.
--- drivers/platform/x86/sony-laptop.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
drivers/platform/x86/sony-laptop.c +5 -7
@@ -2001,18 +2001,14 @@ int sony_pic_camera_command(int command, u8 value)EXPORT_SYMBOL (sony_pic_camera_command);/* gprs/edge modem (SZ460N and SZ210P), thanks to Joshua Wise */ -static void sony_pic_set_wwanpower (u8 state) +static void __sony_pic_set_wwanpower (u8 state) { state = !!state; -mutex_lock (&spic_dev.lock); -if (spic_dev.wwan_power == state) { -mutex_unlock (&spic_dev.lock); +if (spic_dev.wwan_power == state)return ; - }sony_pic_call2 (0xB0 , state);sony_pic_call1 (0x82 ); spic_dev.wwan_power = state; -mutex_unlock (&spic_dev.lock); } static ssize_t sony_pic_wwanpower_store(struct device *dev,
@@ -2024,7 +2020,9 @@ static ssize_t sony_pic_wwanpower_store(struct device *dev,return -EINVAL ; value =simple_strtoul (buffer,NULL ,10 ); -sony_pic_set_wwanpower (value); +mutex_lock (&spic_dev.lock); +__sony_pic_set_wwanpower (value); +mutex_unlock (&spic_dev.lock);return count; }
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 13/14 sony-laptop: update copyright
--- drivers/platform/x86/sony-laptop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/platform/x86/sony-laptop.c +1 -1
@@ -2,7 +2,7 @@* ACPI Sony Notebook Control Driver (SNC and SPIC) * * Copyright (C) 2004-2005 Stelian Pop <[email protected]> -* Copyright (C) 2007 Mattia Dongili <[email protected]> +* Copyright (C) 2007-2009 Mattia Dongili <[email protected]> * * Parts of this driver inspired from asus_acpi.c and ibm_acpi.c * which are copyrighted by their respective authors.
Signature · 1 line
1.6.2
Mattia Dongili
maintainerPATCH 14/14 sony-laptop: Kill the BKL
From: Alessio Igor Bogani <[email protected]>
--- drivers/platform/x86/sony-laptop.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
drivers/platform/x86/sony-laptop.c +8 -4
@@ -46,7 +46,6 @@#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/backlight.h> #include <linux/platform_device.h>
@@ -2180,10 +2179,15 @@ static int sonypi_misc_release(struct inode *inode, struct file *file)static int sonypi_misc_open (struct inode *inode,struct file *file) {/* Flush input queue on first open */ -lock_kernel (); +unsigned long flags; + +spin_lock_irqsave (sonypi_compat.fifo->lock, flags); +if (atomic_inc_return (&sonypi_compat.open_count) ==1 ) -kfifo_reset (sonypi_compat.fifo); -unlock_kernel (); +__kfifo_reset (sonypi_compat.fifo); + +spin_unlock_irqrestore (sonypi_compat.fifo->lock, flags); +return 0 ; }
Signature · 1 line
1.6.2
Re: [PATCH 11/14] sony-laptop: Add FW specific hotkey events and DMI
In reply to Mattia DongiliQuoted 1 line · Mattia Dongili
From: Anton Veretenenko <[email protected]>
It's a minor issue, but the subject doesn't quite match the patch now - there's no DMI code needed.
Signature · 1 line
Matthew Garrett | [email protected]
Mattia Dongili
maintainerRe: [PATCH 11/14] sony-laptop: Add FW specific hotkey events and DMI
Quoted 5 lines · Matthew Garrett
Quoted 1 line · Mattia Dongili
From: Anton Veretenenko <[email protected]>
It's a minor issue, but the subject doesn't quite match the patch now - there's no DMI code needed.
Aaaargh! I forgot to edit the commit text after editing the patch. I'll resend this one with a proper subject.
Signature · 2 lines
mattia :wq!
Mattia Dongili
maintainerPATCH v2 11/14 sony-laptop: Add FW specific hotkey events
In reply to Mattia DongiliFrom: Anton Veretenenko <[email protected]>
--- drivers/platform/x86/sony-laptop.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/platform/x86/sony-laptop.c +6 -0
@@ -870,6 +870,12 @@ static struct sony_nc_event sony_100_events[] = { { 0x11, SONYPI_EVENT_ANYBUTTON_RELEASED }, { 0x81, SONYPI_EVENT_FNKEY_F1 }, { 0x01, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x82, SONYPI_EVENT_FNKEY_F2 }, + { 0x02, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x83, SONYPI_EVENT_FNKEY_F3 }, + { 0x03, SONYPI_EVENT_FNKEY_RELEASED }, + { 0x84, SONYPI_EVENT_FNKEY_F4 }, + { 0x04, SONYPI_EVENT_FNKEY_RELEASED }, { 0x85, SONYPI_EVENT_FNKEY_F5 }, { 0x05, SONYPI_EVENT_FNKEY_RELEASED }, { 0x86, SONYPI_EVENT_FNKEY_F6 },
Signature · 1 line
1.6.2
Len Brown
reviewerQuoted 5 lines · Mattia Dongili
this patch-set includes the great work done by Matthew Garret to add support for recent Vaio models and better support the old ones too in addition to other smaller changes I had sitting here for a while now.
Hopefully I got the signoffs correctly this time.
They look good.
I've replaced the previous sony-laptop series w/ this one.
thanks,
Len Brown, Intel Open Source Technology Center