From 14991fc7dfc6cd18b0d79ebc8f39b1350cb34fc9 Mon Sep 17 00:00:00 2001 From: Azael Avalos Date: Mon, 28 Sep 2015 20:32:28 -0600 Subject: platform/x86: Toshiba WMI Hotkey Driver Toshiba laptops that feature WMI events for hotkeys were left unsupported by the toshiba_acpi driver, however, commit a88bc06e5aec ("toshiba_acpi: Avoid registering input device on WMI event laptops") added hardware support for such laptops, but the hotkeys are not handled there. This driver adds support for hotkey monitoring on certain Toshiba laptops that manage the hotkeys via WMI events instead of the Toshiba Configuration Interface (TCI). The toshiba_acpi driver and this one can co-exist, as this only takes care of hotkeys, while the proper takes care of hardware related stuff. Currently the driver is under the EXPERIMENTAL flag, as the keymap and the notify function are incomplete (due to lack of hardware to test). Signed-off-by: Azael Avalos Signed-off-by: Darren Hart --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 9f6685f6c5a9..adb8e5820506 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10529,6 +10529,12 @@ L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/toshiba_haps.c +TOSHIBA WMI HOTKEYS DRIVER +M: Azael Avalos +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: drivers/platform/x86/toshiba-wmi.c + TOSHIBA SMM DRIVER M: Jonathan Buzzard W: http://www.buzzard.org.uk/toshiba/ -- cgit v1.2.3-59-g8ed1b From 3a4bceeffae5b170af523cd9f2798d5a0d14a2d7 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Tue, 6 Oct 2015 23:17:04 +0100 Subject: MAINTAINERS: Add drivers/platform/olpc to drivers/platform/x86 Andy Shevchenko sent me a simple patch that's been sitting on LKML for 10 months for OLPC and asked if I'd take it via platform/drivers/x86. OLPC appears to be unmaintained per MAINTAINERS. Add it to platform/drivers/x86 (unless someone else really wants it!) Signed-off-by: Darren Hart --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index adb8e5820506..37997b3c6ddc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11459,6 +11459,7 @@ L: platform-driver-x86@vger.kernel.org T: git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git S: Maintained F: drivers/platform/x86/ +F: drivers/platform/olpc/ X86 MCE INFRASTRUCTURE M: Tony Luck -- cgit v1.2.3-59-g8ed1b