aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorKyle Evans <kvans32@gmail.com>2013-01-31 15:44:27 -0500
committerMatthew Garrett <matthew.garrett@nebula.com>2013-02-27 08:30:42 -0500
commitfabf85e3ca15d5b94058f391dac8df870cdd427a (patch)
tree622d851396dc213a469d4e7ec47fecbe5eb7199b /drivers/platform
parent2adb95d83f6e915a7d3793a8f6aa8e6e9463357c (diff)
hp-wmi: Add support for SMBus hotkeys
Several models of HP laptops using the same DSDT have hotkey buttons that do not work until the EC is configured to enable them. Signed-off-by: Kyle Evans <kvans32@gmail.com> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/hp-wmi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 2179c03b94de..be9227dd82be 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -138,6 +138,7 @@ static const struct key_entry hp_wmi_keymap[] = {
138 { KE_KEY, 0x2142, { KEY_MEDIA } }, 138 { KE_KEY, 0x2142, { KEY_MEDIA } },
139 { KE_KEY, 0x213b, { KEY_INFO } }, 139 { KE_KEY, 0x213b, { KEY_INFO } },
140 { KE_KEY, 0x2169, { KEY_DIRECTION } }, 140 { KE_KEY, 0x2169, { KEY_DIRECTION } },
141 { KE_KEY, 0x216a, { KEY_SETUP } },
141 { KE_KEY, 0x231b, { KEY_HELP } }, 142 { KE_KEY, 0x231b, { KEY_HELP } },
142 { KE_END, 0 } 143 { KE_END, 0 }
143}; 144};
@@ -926,6 +927,9 @@ static int __init hp_wmi_init(void)
926 err = hp_wmi_input_setup(); 927 err = hp_wmi_input_setup();
927 if (err) 928 if (err)
928 return err; 929 return err;
930
931 //Enable magic for hotkeys that run on the SMBus
932 ec_write(0xe6,0x6e);
929 } 933 }
930 934
931 if (bios_capable) { 935 if (bios_capable) {