diff options
| -rw-r--r-- | drivers/platform/x86/sony-laptop.c | 4 | ||||
| -rw-r--r-- | include/linux/sonypi.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index a2a742c8ff7e..9710f70040ba 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
| @@ -232,6 +232,7 @@ static int sony_laptop_input_index[] = { | |||
| 232 | 56, /* 69 SONYPI_EVENT_VOLUME_INC_PRESSED */ | 232 | 56, /* 69 SONYPI_EVENT_VOLUME_INC_PRESSED */ |
| 233 | 57, /* 70 SONYPI_EVENT_VOLUME_DEC_PRESSED */ | 233 | 57, /* 70 SONYPI_EVENT_VOLUME_DEC_PRESSED */ |
| 234 | -1, /* 71 SONYPI_EVENT_BRIGHTNESS_PRESSED */ | 234 | -1, /* 71 SONYPI_EVENT_BRIGHTNESS_PRESSED */ |
| 235 | 58, /* 72 SONYPI_EVENT_MEDIA_PRESSED */ | ||
| 235 | }; | 236 | }; |
| 236 | 237 | ||
| 237 | static int sony_laptop_input_keycode_map[] = { | 238 | static int sony_laptop_input_keycode_map[] = { |
| @@ -293,6 +294,7 @@ static int sony_laptop_input_keycode_map[] = { | |||
| 293 | KEY_F15, /* 55 SONYPI_EVENT_SETTINGKEY_PRESSED */ | 294 | KEY_F15, /* 55 SONYPI_EVENT_SETTINGKEY_PRESSED */ |
| 294 | KEY_VOLUMEUP, /* 56 SONYPI_EVENT_VOLUME_INC_PRESSED */ | 295 | KEY_VOLUMEUP, /* 56 SONYPI_EVENT_VOLUME_INC_PRESSED */ |
| 295 | KEY_VOLUMEDOWN, /* 57 SONYPI_EVENT_VOLUME_DEC_PRESSED */ | 296 | KEY_VOLUMEDOWN, /* 57 SONYPI_EVENT_VOLUME_DEC_PRESSED */ |
| 297 | KEY_MEDIA, /* 58 SONYPI_EVENT_MEDIA_PRESSED */ | ||
| 296 | }; | 298 | }; |
| 297 | 299 | ||
| 298 | /* release buttons after a short delay if pressed */ | 300 | /* release buttons after a short delay if pressed */ |
| @@ -890,6 +892,8 @@ static struct sony_nc_event sony_100_events[] = { | |||
| 890 | { 0x0C, SONYPI_EVENT_FNKEY_RELEASED }, | 892 | { 0x0C, SONYPI_EVENT_FNKEY_RELEASED }, |
| 891 | { 0x9f, SONYPI_EVENT_CD_EJECT_PRESSED }, | 893 | { 0x9f, SONYPI_EVENT_CD_EJECT_PRESSED }, |
| 892 | { 0x1f, SONYPI_EVENT_ANYBUTTON_RELEASED }, | 894 | { 0x1f, SONYPI_EVENT_ANYBUTTON_RELEASED }, |
| 895 | { 0xa1, SONYPI_EVENT_MEDIA_PRESSED }, | ||
| 896 | { 0x21, SONYPI_EVENT_ANYBUTTON_RELEASED }, | ||
| 893 | { 0, 0 }, | 897 | { 0, 0 }, |
| 894 | }; | 898 | }; |
| 895 | 899 | ||
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h index 34c4475ac4a2..4f95c1aac2fd 100644 --- a/include/linux/sonypi.h +++ b/include/linux/sonypi.h | |||
| @@ -111,6 +111,7 @@ | |||
| 111 | #define SONYPI_EVENT_VOLUME_INC_PRESSED 69 | 111 | #define SONYPI_EVENT_VOLUME_INC_PRESSED 69 |
| 112 | #define SONYPI_EVENT_VOLUME_DEC_PRESSED 70 | 112 | #define SONYPI_EVENT_VOLUME_DEC_PRESSED 70 |
| 113 | #define SONYPI_EVENT_BRIGHTNESS_PRESSED 71 | 113 | #define SONYPI_EVENT_BRIGHTNESS_PRESSED 71 |
| 114 | #define SONYPI_EVENT_MEDIA_PRESSED 72 | ||
| 114 | 115 | ||
| 115 | /* get/set brightness */ | 116 | /* get/set brightness */ |
| 116 | #define SONYPI_IOCGBRT _IOR('v', 0, __u8) | 117 | #define SONYPI_IOCGBRT _IOR('v', 0, __u8) |
