platform-drivers-x86 for 4.3-1
Significant work on toshiba_acpi, including new hardware support,
refactoring, and cleanups. Extend device support for asus, ideapad, and
acer systems. New surface pro 3 buttons driver. Misc. minor cleanups for
thinkpad and hp-wireless.
acer-wmi:
- No rfkill on HP Omen 15 wifi
thinkpad_acpi
- Remove side effects from vdbg_printk -> no_printk macro
surface pro 3
- Add support driver for Surface Pro 3 buttons
hp-wireless
- remove unneeded goto/label in hpwl_init
ideapad-laptop
- add alternative representation for Yoga 2 to DMI table
- Add Lenovo Yoga 3 14 to no_hw_rfkill dmi list
asus-laptop
- Add key found on Asus F3M
MAINTAINERS
- Remove Toshiba Linux mailing list address
toshiba_acpi:
- Bump driver version to 0.23
- Remove unnecessary checks and returns in HCI/SCI functions
- Refactor *{get, set} functions return value
- Remove "*not supported" feature prints
- Change *available functions return type
- Add set_fan_status function
- Change some variables to avoid warnings from ninja-check
- Reorder toshiba_acpi_alt_keymap entries
- Remove unused wireless defines
- Transflective backlight updates
- Avoid registering input device on WMI event laptops
- Add /dev/toshiba_acpi device
- Adapt /proc/acpi/toshiba/keys to TOS1900 devices
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJV6K71AAoJEKbMaAwKp364lzAIAIKeesYU4VevKg2wL6Em/dVP
4ftDgzhvFRQhM0CEe+uR8NWFNB/CVKVSphKD5mFtc0NAs0S0Eo/tmAlERfeq0qkt
HFSpP80deU+CwjURLo4wgMbPBPudHA3bNDZfSY6vq+/JhakdtheLyAODOda7uegz
PHV0zrgDntwVDAuBPTB2h6KigFXSc3soGCWcHTjD0PLNvTGvWOiNYO7otsclNzFc
qC0uerR4ryt6OFtul900/U/x1bfM9OAFNSnqWpfkkhQ4nskmkzDsyXutXm3CtXso
Ol3YS0Saj3gBGUmYua1smSU5u4IU9cQNeq6EEgR4jdHt2QQ8fJfmT0v5UgeiHHw=
=UZPt
-----END PGP SIGNATURE-----
Merge tag 'platform-drivers-x86-v4.3-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
Pull x86 platform driver updates from Darren Hart:
"Significant work on toshiba_acpi, including new hardware support,
refactoring, and cleanups. Extend device support for asus, ideapad,
and acer systems. New surface pro 3 buttons driver. Misc minor
cleanups for thinkpad and hp-wireless.
acer-wmi:
- No rfkill on HP Omen 15 wifi
thinkpad_acpi:
- Remove side effects from vdbg_printk -> no_printk macro
surface pro 3:
- Add support driver for Surface Pro 3 buttons
hp-wireless:
- remove unneeded goto/label in hpwl_init
ideapad-laptop:
- add alternative representation for Yoga 2 to DMI table
- Add Lenovo Yoga 3 14 to no_hw_rfkill dmi list
asus-laptop:
- Add key found on Asus F3M
MAINTAINERS:
- Remove Toshiba Linux mailing list address
toshiba_acpi:
- Bump driver version to 0.23
- Remove unnecessary checks and returns in HCI/SCI functions
- Refactor *{get, set} functions return value
- Remove "*not supported" feature prints
- Change *available functions return type
- Add set_fan_status function
- Change some variables to avoid warnings from ninja-check
- Reorder toshiba_acpi_alt_keymap entries
- Remove unused wireless defines
- Transflective backlight updates
- Avoid registering input device on WMI event laptops
- Add /dev/toshiba_acpi device
- Adapt /proc/acpi/toshiba/keys to TOS1900 devices"
* tag 'platform-drivers-x86-v4.3-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (21 commits)
acer-wmi: No rfkill on HP Omen 15 wifi
thinkpad_acpi: Remove side effects from vdbg_printk -> no_printk macro
surface pro 3: Add support driver for Surface Pro 3 buttons
hp-wireless: remove unneeded goto/label in hpwl_init
ideapad-laptop: add alternative representation for Yoga 2 to DMI table
asus-laptop: Add key found on Asus F3M
MAINTAINERS: Remove Toshiba Linux mailing list address
ideapad-laptop: Add Lenovo Yoga 3 14 to no_hw_rfkill dmi list
toshiba_acpi: Bump driver version to 0.23
toshiba_acpi: Remove unnecessary checks and returns in HCI/SCI functions
toshiba_acpi: Refactor *{get, set} functions return value
toshiba_acpi: Remove "*not supported" feature prints
toshiba_acpi: Change *available functions return type
toshiba_acpi: Add set_fan_status function
toshiba_acpi: Change some variables to avoid warnings from ninja-check
toshiba_acpi: Reorder toshiba_acpi_alt_keymap entries
toshiba_acpi: Remove unused wireless defines
toshiba_acpi: Transflective backlight updates
toshiba_acpi: Avoid registering input device on WMI event laptops
toshiba_acpi: Add /dev/toshiba_acpi device
...
This commit is contained in:
commit
3af6e98f25
12 changed files with 703 additions and 390 deletions
|
|
@ -1,6 +1,7 @@
|
|||
/* toshiba.h -- Linux driver for accessing the SMM on Toshiba laptops
|
||||
*
|
||||
* Copyright (c) 1996-2000 Jonathan A. Buzzard (jonathan@buzzard.org.uk)
|
||||
* Copyright (c) 2015 Azael Avalos <coproscefalo@gmail.com>
|
||||
*
|
||||
* Thanks to Juergen Heinzl <juergen@monocerus.demon.co.uk> for the pointers
|
||||
* on making sure the structure is aligned and packed.
|
||||
|
|
@ -20,9 +21,18 @@
|
|||
#ifndef _UAPI_LINUX_TOSHIBA_H
|
||||
#define _UAPI_LINUX_TOSHIBA_H
|
||||
|
||||
#define TOSH_PROC "/proc/toshiba"
|
||||
#define TOSH_DEVICE "/dev/toshiba"
|
||||
#define TOSH_SMM _IOWR('t', 0x90, int) /* broken: meant 24 bytes */
|
||||
/*
|
||||
* Toshiba modules paths
|
||||
*/
|
||||
|
||||
#define TOSH_PROC "/proc/toshiba"
|
||||
#define TOSH_DEVICE "/dev/toshiba"
|
||||
#define TOSHIBA_ACPI_PROC "/proc/acpi/toshiba"
|
||||
#define TOSHIBA_ACPI_DEVICE "/dev/toshiba_acpi"
|
||||
|
||||
/*
|
||||
* Toshiba SMM structure
|
||||
*/
|
||||
|
||||
typedef struct {
|
||||
unsigned int eax;
|
||||
|
|
@ -33,5 +43,21 @@ typedef struct {
|
|||
unsigned int edi __attribute__ ((packed));
|
||||
} SMMRegisters;
|
||||
|
||||
/*
|
||||
* IOCTLs (0x90 - 0x91)
|
||||
*/
|
||||
|
||||
#define TOSH_SMM _IOWR('t', 0x90, SMMRegisters)
|
||||
/*
|
||||
* Convenience toshiba_acpi command.
|
||||
*
|
||||
* The System Configuration Interface (SCI) is opened/closed internally
|
||||
* to avoid userspace of buggy BIOSes.
|
||||
*
|
||||
* The toshiba_acpi module checks whether the eax register is set with
|
||||
* SCI_GET (0xf300) or SCI_SET (0xf400), returning -EINVAL if not.
|
||||
*/
|
||||
#define TOSHIBA_ACPI_SCI _IOWR('t', 0x91, SMMRegisters)
|
||||
|
||||
|
||||
#endif /* _UAPI_LINUX_TOSHIBA_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue