Commit fba956c4 authored by Jeremy Katz's avatar Jeremy Katz Committed by Linus Torvalds
Browse files

Map volume and brightness events on thinkpads 



There are standard keycodes for brightness and volume; map the events to
emit them so that things work properly

Signed-off-by: default avatarJeremy Katz <katzj@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2e1d89f

drivers/misc/thinkpad_acpi.c

+8 −8
Original line number Diff line number Diff line
@@ -945,15 +945,15 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
		KEY_UNKNOWN,	/* 0x0C: FN+BACKSPACE */

		KEY_UNKNOWN,	/* 0x0D: FN+INSERT */

		KEY_UNKNOWN,	/* 0x0E: FN+DELETE */

		KEY_RESERVED,	/* 0x0F: FN+HOME (brightness up) */

		KEY_BRIGHTNESSUP,	/* 0x0F: FN+HOME (brightness up) */

		/* Scan codes 0x10 to 0x1F: Extended ACPI HKEY hot keys */

		KEY_RESERVED,	/* 0x10: FN+END (brightness down) */

		KEY_BRIGHTNESSDOWN,	/* 0x10: FN+END (brightness down) */

		KEY_RESERVED,	/* 0x11: FN+PGUP (thinklight toggle) */

		KEY_UNKNOWN,	/* 0x12: FN+PGDOWN */

		KEY_ZOOM,	/* 0x13: FN+SPACE (zoom) */

		KEY_RESERVED,	/* 0x14: VOLUME UP */

		KEY_RESERVED,	/* 0x15: VOLUME DOWN */

		KEY_RESERVED,	/* 0x16: MUTE */

		KEY_VOLUMEUP,	/* 0x14: VOLUME UP */

		KEY_VOLUMEDOWN,	/* 0x15: VOLUME DOWN */

		KEY_MUTE,	/* 0x16: MUTE */

		KEY_VENDOR,	/* 0x17: Thinkpad/AccessIBM/Lenovo */

		/* (assignments unknown, please report if found) */

		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,
@@ -974,9 +974,9 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
		KEY_RESERVED,	/* 0x11: FN+PGUP (thinklight toggle) */

		KEY_UNKNOWN,	/* 0x12: FN+PGDOWN */

		KEY_ZOOM,	/* 0x13: FN+SPACE (zoom) */

		KEY_RESERVED,	/* 0x14: VOLUME UP */

		KEY_RESERVED,	/* 0x15: VOLUME DOWN */

		KEY_RESERVED,	/* 0x16: MUTE */

		KEY_VOLUMEUP,	/* 0x14: VOLUME UP */

		KEY_VOLUMEDOWN,	/* 0x15: VOLUME DOWN */

		KEY_MUTE,	/* 0x16: MUTE */

		KEY_VENDOR,	/* 0x17: Thinkpad/AccessIBM/Lenovo */

		/* (assignments unknown, please report if found) */

		KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN,

CRA Git | Maintained and supported by SUSTech CRA and CCSE