Signed-off-by: Łukasz Stelmach <[email protected]>
---
drivers/platform/x86/asus-laptop.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 58d29c4..f2b5d0a 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -332,6 +332,7 @@ static const struct key_entry asus_keymap[] = {
{KE_KEY, 0x65, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV */
{KE_KEY, 0x66, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV */
{KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */
+ {KE_KEY, 0x6A, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad Fn + F9 */
{KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
{KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
{KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
--
2.1.4
Thanks Łukasz,
The following change seems reasonable.
While it's trivial, please provide some context in your commit message. I do not
merge commits with empty messages. There is always something to say. Did you see
a dmesg error, the key just didn't work, the 0x6A is new on model XYZ but you
don't know if others have it, it's from your personal experience, or came from
an ASUS manual, etc. There is always something to provide context which will be
useful to someone looking at this change - or looking for this fix when they hit
this problem on an older kernel.
Thanks,
On Fri, Jul 24, 2015 at 07:17:11PM +0200, Łukasz Stelmach wrote:
> Signed-off-by: Łukasz Stelmach <[email protected]>
> ---
> drivers/platform/x86/asus-laptop.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
> index 58d29c4..f2b5d0a 100644
> --- a/drivers/platform/x86/asus-laptop.c
> +++ b/drivers/platform/x86/asus-laptop.c
> @@ -332,6 +332,7 @@ static const struct key_entry asus_keymap[] = {
> {KE_KEY, 0x65, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV */
> {KE_KEY, 0x66, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV */
> {KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */
> + {KE_KEY, 0x6A, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad Fn + F9 */
> {KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
> {KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
> {KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
> --
> 2.1.4
>
>
--
Darren Hart
Intel Open Source Technology Center
Asus F3M has two keys labeled with an icon of a touchpad. The first,
reported as 0x6B is next to the power key and the second, reported as
0x6A, is F9 combined with Fn button. When I was pressing the latter, I was
getting "Unknown key 6a pressed" message before applying this patch.
Asus F3M does not support WMI so the commit does not update key mappings
in the asus-nb-wmi.c file.
I have not tested this mapping on any other Asus laptop.
Signed-off-by: Łukasz Stelmach <[email protected]>
---
drivers/platform/x86/asus-laptop.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 58d29c4..f2b5d0a 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -332,6 +332,7 @@ static const struct key_entry asus_keymap[] = {
{KE_KEY, 0x65, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV */
{KE_KEY, 0x66, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV */
{KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */
+ {KE_KEY, 0x6A, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad Fn + F9 */
{KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
{KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
{KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
--
2.1.4
On Wed, Jul 29, 2015 at 09:31:23PM +0200, Łukasz Stelmach wrote:
> Asus F3M has two keys labeled with an icon of a touchpad. The first,
> reported as 0x6B is next to the power key and the second, reported as
> 0x6A, is F9 combined with Fn button. When I was pressing the latter, I was
> getting "Unknown key 6a pressed" message before applying this patch.
>
> Asus F3M does not support WMI so the commit does not update key mappings
> in the asus-nb-wmi.c file.
>
> I have not tested this mapping on any other Asus laptop.
>
> Signed-off-by: Łukasz Stelmach <[email protected]>
Thanks Łukasz.
Corentin, any concerns?
> ---
> drivers/platform/x86/asus-laptop.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
> index 58d29c4..f2b5d0a 100644
> --- a/drivers/platform/x86/asus-laptop.c
> +++ b/drivers/platform/x86/asus-laptop.c
> @@ -332,6 +332,7 @@ static const struct key_entry asus_keymap[] = {
> {KE_KEY, 0x65, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV */
> {KE_KEY, 0x66, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV */
> {KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */
> + {KE_KEY, 0x6A, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad Fn + F9 */
> {KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
> {KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
> {KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
> --
> 2.1.4
>
>
--
Darren Hart
Intel Open Source Technology Center
On Wed, Aug 5, 2015 at 10:29 PM, Darren Hart <[email protected]> wrote:
> On Wed, Jul 29, 2015 at 09:31:23PM +0200, Łukasz Stelmach wrote:
>> Asus F3M has two keys labeled with an icon of a touchpad. The first,
>> reported as 0x6B is next to the power key and the second, reported as
>> 0x6A, is F9 combined with Fn button. When I was pressing the latter, I was
>> getting "Unknown key 6a pressed" message before applying this patch.
>>
>> Asus F3M does not support WMI so the commit does not update key mappings
>> in the asus-nb-wmi.c file.
>>
>> I have not tested this mapping on any other Asus laptop.
>>
>> Signed-off-by: Łukasz Stelmach <[email protected]>
>
> Thanks Łukasz.
>
> Corentin, any concerns?
Acked-by: Corentin Chary <[email protected]>
Sorry for the delay, I won't really have a stable internet connection
until October.
>
>> ---
>> drivers/platform/x86/asus-laptop.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
>> index 58d29c4..f2b5d0a 100644
>> --- a/drivers/platform/x86/asus-laptop.c
>> +++ b/drivers/platform/x86/asus-laptop.c
>> @@ -332,6 +332,7 @@ static const struct key_entry asus_keymap[] = {
>> {KE_KEY, 0x65, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV */
>> {KE_KEY, 0x66, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV */
>> {KE_KEY, 0x67, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV */
>> + {KE_KEY, 0x6A, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad Fn + F9 */
>> {KE_KEY, 0x6B, { KEY_TOUCHPAD_TOGGLE } }, /* Lock Touchpad */
>> {KE_KEY, 0x6C, { KEY_SLEEP } }, /* Suspend */
>> {KE_KEY, 0x6D, { KEY_SLEEP } }, /* Hibernate */
>> --
>> 2.1.4
>>
>>
>
> --
> Darren Hart
> Intel Open Source Technology Center
--
Corentin Chary
http://xf.iksaif.net
On Wed, Aug 12, 2015 at 09:06:08AM +0200, Corentin Chary wrote:
> On Wed, Aug 5, 2015 at 10:29 PM, Darren Hart <[email protected]> wrote:
> > On Wed, Jul 29, 2015 at 09:31:23PM +0200, Łukasz Stelmach wrote:
> >> Asus F3M has two keys labeled with an icon of a touchpad. The first,
> >> reported as 0x6B is next to the power key and the second, reported as
> >> 0x6A, is F9 combined with Fn button. When I was pressing the latter, I was
> >> getting "Unknown key 6a pressed" message before applying this patch.
> >>
> >> Asus F3M does not support WMI so the commit does not update key mappings
> >> in the asus-nb-wmi.c file.
> >>
> >> I have not tested this mapping on any other Asus laptop.
> >>
> >> Signed-off-by: Łukasz Stelmach <[email protected]>
> >
> > Thanks Łukasz.
> >
> > Corentin, any concerns?
>
> Acked-by: Corentin Chary <[email protected]>
>
> Sorry for the delay, I won't really have a stable internet connection
> until October.
It's already in next, but thank you for following up.
--
Darren Hart
Intel Open Source Technology Center