lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asus-wmi: always report brightness key events

Browse Source 
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
This commit is contained in:
Corentin Chary
2012-11-29 09:12:38 +01:00
committed by Matthew Garrett
parent 7517a17c1a
commit 3ba0302bdd
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/platform/x86/asus-nb-wmi.c
View File

@@ -190,6 +190,8 @@ static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver)
} }
static const struct key_entry asus_nb_wmi_keymap[] = { static const struct key_entry asus_nb_wmi_keymap[] = {
{ KE_KEY, ASUS_WMI_BRN_DOWN, { KEY_BRIGHTNESSDOWN } },
{ KE_KEY, ASUS_WMI_BRN_UP, { KEY_BRIGHTNESSUP } },
{ KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x30, { KEY_VOLUMEUP } },
{ KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
{ KE_KEY, 0x32, { KEY_MUTE } }, { KE_KEY, 0x32, { KEY_MUTE } },

8
drivers/platform/x86/asus-wmi.c
View File

@@ -1391,16 +1391,16 @@ static void asus_wmi_notify(u32 value, void *context)
} }
if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
code = NOTIFY_BRNUP_MIN; code = ASUS_WMI_BRN_UP;
else if (code >= NOTIFY_BRNDOWN_MIN && else if (code >= NOTIFY_BRNDOWN_MIN &&
code <= NOTIFY_BRNDOWN_MAX) code <= NOTIFY_BRNDOWN_MAX)
code = NOTIFY_BRNDOWN_MIN; code = ASUS_WMI_BRN_DOWN;
if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) { if (code == ASUS_WMI_BRN_DOWN || code == ASUS_WMI_BRN_UP) {
if (!acpi_video_backlight_support()) { if (!acpi_video_backlight_support()) {
asus_wmi_backlight_notify(asus, orig_code); asus_wmi_backlight_notify(asus, orig_code);
goto exit;
} }
goto exit;
} }
if (is_display_toggle(code) && if (is_display_toggle(code) &&

2
drivers/platform/x86/asus-wmi.h
View File

@@ -30,6 +30,8 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#define ASUS_WMI_KEY_IGNORE (-1) #define ASUS_WMI_KEY_IGNORE (-1)
#define ASUS_WMI_BRN_DOWN 0x20
#define ASUS_WMI_BRN_UP 0x2f
struct module; struct module;
struct key_entry; struct key_entry;

2
drivers/platform/x86/eeepc-wmi.c
View File

@@ -63,6 +63,8 @@ MODULE_PARM_DESC(hotplug_wireless,
#define HOME_RELEASE 0xe5 #define HOME_RELEASE 0xe5
static const struct key_entry eeepc_wmi_keymap[] = { static const struct key_entry eeepc_wmi_keymap[] = {
{ KE_KEY, ASUS_WMI_BRN_DOWN, { KEY_BRIGHTNESSDOWN } },
{ KE_KEY, ASUS_WMI_BRN_UP, { KEY_BRIGHTNESSUP } },
/* Sleep already handled via generic ACPI code */ /* Sleep already handled via generic ACPI code */
{ KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x30, { KEY_VOLUMEUP } },
{ KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } },