platform/x86: asus-wmi: Move asus_wmi_input_init and _exit lower in the file
PATCH 1/3 platform/x86: asus-wmi: Move asus_wmi_input_init and _exit lower in the file
Move the asus_wmi_input_init() and asus_wmi_input_exit() functions to below the WMI helpers, so that further patches in this patch-set can use the WMI helpers inside asus_wmi_input_init() without needing a forward declaration.
Note this commit makes no functional changes, the moved block of code is completely unchanged.
--- drivers/platform/x86/asus-wmi.c | 78 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-)
drivers/platform/x86/asus-wmi.c +39 -39
@@ -222,45 +222,6 @@ struct asus_wmi {struct asus_wmi_driver *driver; }; -/* Input **********************************************************************/ - -static int asus_wmi_input_init (struct asus_wmi *asus) -{ -int err; - - asus->inputdev =input_allocate_device (); -if (!asus->inputdev) -return -ENOMEM ; - - asus->inputdev->name = asus->driver->input_name; - asus->inputdev->phys = asus->driver->input_phys; - asus->inputdev->id.bustype =BUS_HOST ; - asus->inputdev->dev.parent = &asus->platform_device->dev; -set_bit (EV_REP , asus->inputdev->evbit); - - err =sparse_keymap_setup (asus->inputdev, asus->driver->keymap,NULL ); -if (err) - goto err_free_dev; - - err =input_register_device (asus->inputdev); -if (err) - goto err_free_dev; - -return 0 ; - -err_free_dev: -input_free_device (asus->inputdev); -return err; -} - -static void asus_wmi_input_exit (struct asus_wmi *asus) -{ -if (asus->inputdev) -input_unregister_device (asus->inputdev); - - asus->inputdev =NULL ; -} -/* WMI ************************************************************************/ static int asus_wmi_evaluate_method3(u32 method_id,
@@ -381,6 +342,45 @@ static bool asus_wmi_dev_is_present(struct asus_wmi *asus, u32 dev_id)return status ==0 && (retval &ASUS_WMI_DSTS_PRESENCE_BIT ); } +/* Input **********************************************************************/ + +static int asus_wmi_input_init (struct asus_wmi *asus) +{ +int err; + + asus->inputdev =input_allocate_device (); +if (!asus->inputdev) +return -ENOMEM ; + + asus->inputdev->name = asus->driver->input_name; + asus->inputdev->phys = asus->driver->input_phys; + asus->inputdev->id.bustype =BUS_HOST ; + asus->inputdev->dev.parent = &asus->platform_device->dev; +set_bit (EV_REP , asus->inputdev->evbit); + + err =sparse_keymap_setup (asus->inputdev, asus->driver->keymap,NULL ); +if (err) + goto err_free_dev; + + err =input_register_device (asus->inputdev); +if (err) + goto err_free_dev; + +return 0 ; + +err_free_dev: +input_free_device (asus->inputdev); +return err; +} + +static void asus_wmi_input_exit (struct asus_wmi *asus) +{ +if (asus->inputdev) +input_unregister_device (asus->inputdev); + + asus->inputdev =NULL ; +} +/* Battery ********************************************************************/ /* The battery maximum charging percentage */
Signature · 1 line
2.26.0
PATCH 2/3 platform/x86: asus-wmi: Add support for SW_TABLET_MODE
On Asus 2-in-1s with a detachable keyboard the Asus WMI interface reports if the tablet is attached to the keyboard or not.
Report if the 2-in-1 is in tablet or clamshell mode to userspace by reporting SW_TABLET_MODE events to userspace.
This has been tested on a T100TA, T100CHI, T100HA and T200TA.
--- drivers/platform/x86/asus-wmi.c | 24 ++++++++++++++++++++-- include/linux/platform_data/x86/asus-wmi.h | 3 +++ 2 files changed, 25 insertions(+), 2 deletions(-)
drivers/platform/x86/asus-wmi.c +22 -2
@@ -57,6 +57,7 @@ MODULE_LICENSE("GPL");#define NOTIFY_BRNDOWN_MIN 0x20#define NOTIFY_BRNDOWN_MAX 0x2e#define NOTIFY_FNLOCK_TOGGLE 0x4e +#define NOTIFY_KBD_DOCK_CHANGE 0x75#define NOTIFY_KBD_BRTUP 0xc4#define NOTIFY_KBD_BRTDWN 0xc5#define NOTIFY_KBD_BRTTOGGLE 0xc7
@@ -346,7 +347,7 @@ static bool asus_wmi_dev_is_present(struct asus_wmi *asus, u32 dev_id)static int asus_wmi_input_init (struct asus_wmi *asus) { -int err; +int err, result; asus->inputdev =input_allocate_device ();if (!asus->inputdev)
@@ -362,6 +363,14 @@ static int asus_wmi_input_init(struct asus_wmi *asus)if (err) goto err_free_dev; + result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_KBD_DOCK ); +if (result >=0 ) { +input_set_capability (asus->inputdev,EV_SW ,SW_TABLET_MODE ); +input_report_switch (asus->inputdev,SW_TABLET_MODE , !result); + }else if (result != -ENODEV ) { +pr_err ("Error checking for keyboard-dock: %d\n" , result); + } + err =input_register_device (asus->inputdev);if (err) goto err_free_dev;
@@ -2055,9 +2064,9 @@ static int asus_wmi_get_event_code(u32 value)static void asus_wmi_handle_event_code (int code,struct asus_wmi *asus) { -int orig_code;unsigned int key_value =1 ;bool autorelease =1 ; +int result, orig_code; orig_code = code;
@@ -2102,6 +2111,17 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus)return ; } +if (code ==NOTIFY_KBD_DOCK_CHANGE ) { + result =asus_wmi_get_devstate_simple (asus, +ASUS_WMI_DEVID_KBD_DOCK ); +if (result >=0 ) { +input_report_switch (asus->inputdev,SW_TABLET_MODE , + !result); +input_sync (asus->inputdev); + } +return ; + } +if (asus->fan_boost_mode_available && code ==NOTIFY_KBD_FBM ) {fan_boost_mode_switch_next (asus);return ;
include/linux/platform_data/x86/asus-wmi.h +3 -0
@@ -85,6 +85,9 @@/* Maximum charging percentage */ #define ASUS_WMI_DEVID_RSOC 0x00120057 +/* Keyboard dock */ +#define ASUS_WMI_DEVID_KBD_DOCK 0x00120063 +/* DSTS masks */ #define ASUS_WMI_DSTS_STATUS_BIT 0x00000001#define ASUS_WMI_DSTS_UNKNOWN_BIT 0x00000002
Signature · 1 line
2.26.0
PATCH 3/3 platform/x86: asus-wmi: Ignore WMI events with code 0x79
In reply to Hans de GoedeOn some Asus devices, e.g. the T100TA, when the charger is connected we not only get a WMI event with code 0x58, but immediately after that event we also get an even with code 0x79.
This is likely related to these devices having an Asus WMI device with a device-id of 0x00120066, which seems to provide some sort of charger-type info. The T100TA charger over a micro-USB connector, the embedded- controller register read when calling asus_wmi_get_devstate(0x00120066) returns different values when connected to a USB port (max 500mA charging) vs when connected to a 2A capable wall-charger. But the AML code reading this mangles the return value so that we can no longer tell the difference. So for now the meaning of the value return when getting the status of device-id 0x00120066 is unclear.
This commit adds a key-mapping of code 0x79 to KE_IGNORE, silencing the kernel logging the following message every time the charger is plugged-in:
[ 79.639548] asus_wmi: Unknown key 79 pressed
--- drivers/platform/x86/asus-nb-wmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/asus-nb-wmi.c +1 -0
@@ -472,6 +472,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, { KE_IGNORE, 0x6E, }, /* Low Battery notification */ { KE_KEY, 0x71, { KEY_F13 } }, /* General-purpose button */ + { KE_IGNORE, 0x79, }, /* Charger type dectection notification */ { KE_KEY, 0x7a, { KEY_ALS_TOGGLE } }, /* Ambient Light Sensor Toggle */ { KE_KEY, 0x7c, { KEY_MICMUTE } }, { KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */
Signature · 1 line
2.26.0