[PATCH 6.1/6.6] platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys

[PATCH 6.1/6.6] platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys

[WangYuli]

From: Renato Caldas <renato@calgera.com>

[ Upstream commit 36e66be874a7ea9d28fb9757629899a8449b8748 ]

The scancodes for the Mic Mute and Airplane keys on the Ideapad Pro 5
(14AHP9 at least, probably the other variants too) are different and
were not being picked up by the driver. This adds them to the keymap.

Apart from what is already supported, the remaining fn keys are
unfortunately producing windows-specific key-combos.

Signed-off-by: Renato Caldas <renato@calgera.com>
Link: https://lore.kernel.org/r/20241102183116.30142-1-renato@calgera.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: WangYuli <wangyuli@uniontech.com>
---
 drivers/platform/x86/ideapad-laptop.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 88eefccb6ed2..50013af0537c 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -1101,6 +1101,9 @@ static const struct key_entry ideapad_keymap[] = {
 	{ KE_KEY,	0x27 | IDEAPAD_WMI_KEY, { KEY_HELP } },
 	/* Refresh Rate Toggle */
 	{ KE_KEY,	0x0a | IDEAPAD_WMI_KEY, { KEY_DISPLAYTOGGLE } },
+	/* Specific to some newer models */
+	{ KE_KEY,	0x3e | IDEAPAD_WMI_KEY, { KEY_MICMUTE } },
+	{ KE_KEY,	0x3f | IDEAPAD_WMI_KEY, { KEY_RFKILL } },
 
 	{ KE_END },
 };
-- 
2.50.0

Re: [PATCH 6.1/6.6] platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys

[Sasha Levin]

[ Sasha's backport helper bot ]

Hi,

✅ All tests passed successfully. No issues detected.
No action required from the submitter.

The upstream commit SHA1 provided is correct: 36e66be874a7ea9d28fb9757629899a8449b8748

WARNING: Author mismatch between patch and upstream commit:
Backport author: WangYuli<wangyuli@uniontech.com>
Commit author: Renato Caldas<renato@calgera.com>

Status in newer kernel trees:
6.15.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Not found

Note: The patch differs from the upstream commit:
---
1:  36e66be874a7e ! 1:  fab9d136c5d0f platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys
    @@ Metadata
      ## Commit message ##
         platform/x86: ideapad-laptop: add missing Ideapad Pro 5 fn keys
     
    +    [ Upstream commit 36e66be874a7ea9d28fb9757629899a8449b8748 ]
    +
         The scancodes for the Mic Mute and Airplane keys on the Ideapad Pro 5
         (14AHP9 at least, probably the other variants too) are different and
         were not being picked up by the driver. This adds them to the keymap.
    @@ Commit message
         Link: https://lore.kernel.org/r/20241102183116.30142-1-renato@calgera.com
         Reviewed-by: Hans de Goede <hdegoede@redhat.com>
         Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    +    Signed-off-by: WangYuli <wangyuli@uniontech.com>
     
      ## drivers/platform/x86/ideapad-laptop.c ##
     @@ drivers/platform/x86/ideapad-laptop.c: static const struct key_entry ideapad_keymap[] = {
      	{ KE_KEY,	0x27 | IDEAPAD_WMI_KEY, { KEY_HELP } },
      	/* Refresh Rate Toggle */
    - 	{ KE_KEY,	0x0a | IDEAPAD_WMI_KEY, { KEY_REFRESH_RATE_TOGGLE } },
    + 	{ KE_KEY,	0x0a | IDEAPAD_WMI_KEY, { KEY_DISPLAYTOGGLE } },
     +	/* Specific to some newer models */
     +	{ KE_KEY,	0x3e | IDEAPAD_WMI_KEY, { KEY_MICMUTE } },
     +	{ KE_KEY,	0x3f | IDEAPAD_WMI_KEY, { KEY_RFKILL } },
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y        |  Success    |  Success   |
| stable/linux-6.6.y        |  Success    |  Success   |