60 lines
2.9 KiB
Diff
60 lines
2.9 KiB
Diff
From a52769d2eb64fb56655fad549621667d5a7c0f0d Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 9 Oct 2024 09:14:12 +0200
|
|
Subject: [PATCH] hwdb: move key 66/65 handling from specific to generic HP
|
|
laptop coverage
|
|
|
|
This takes the idea from #18595 and implements it based on our current
|
|
hwdb: the original PR suggested the keys 66/65 are a generic HP thing,
|
|
and not limited to specific laptops. The current specific laptop entries
|
|
do not contradict that claim.
|
|
|
|
Hence, let's move them from the specific sections matching some HP
|
|
laptops to the generic section matching all.
|
|
|
|
This uses the correct key names, which have long been fixed (which used
|
|
to be a problem our CI was tripped off by).
|
|
|
|
This is not tested, but I think fairly risk-less, and should allow us to
|
|
get rid of a really old PR.
|
|
|
|
Replaces: #18595
|
|
(cherry picked from commit 93b078c3dd40b10eed34a77d514b1db7493b17cf)
|
|
|
|
Resolves: RHEL-49810
|
|
---
|
|
hwdb.d/60-keyboard.hwdb | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
|
|
index 4d5f6b4beb..f1af5771f5 100644
|
|
--- a/hwdb.d/60-keyboard.hwdb
|
|
+++ b/hwdb.d/60-keyboard.hwdb
|
|
@@ -637,6 +637,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHaierComputer:pn7G-Series:*
|
|
|
|
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*:*
|
|
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pn*:*
|
|
+ KEYBOARD_KEY_66=pickup_phone # Pickup phone button
|
|
+ KEYBOARD_KEY_65=hangup_phone # Hangup phone button
|
|
KEYBOARD_KEY_81=fn_esc
|
|
KEYBOARD_KEY_89=battery # Fn+F8
|
|
KEYBOARD_KEY_8a=screenlock # Fn+F6
|
|
@@ -804,8 +806,6 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBook*:*
|
|
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPZBookStudioG5*:*
|
|
KEYBOARD_KEY_64=calendar # Calendar icon (Fn + F12)
|
|
KEYBOARD_KEY_6d=displaytoggle # Display icon
|
|
- KEYBOARD_KEY_66=pickup_phone # Pickup phone button
|
|
- KEYBOARD_KEY_65=hangup_phone # Hangup phone button
|
|
|
|
# HP ZBook 15 G2
|
|
evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHPZBook15G2:*
|
|
@@ -869,8 +869,6 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHP*:pnHPProBook11G2*:pvr*
|
|
evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*mt44*Mobile*Thin*Client*:*
|
|
KEYBOARD_KEY_64=calendar # Calendar icon (Fn + F12)
|
|
KEYBOARD_KEY_6d=displaytoggle # Display icon
|
|
- KEYBOARD_KEY_66=pickup_phone # Pickup phone button
|
|
- KEYBOARD_KEY_65=hangup_phone # Hangup phone button
|
|
KEYBOARD_KEY_81=f20 # Fn+F8; Microphone mute button, should be micmute
|
|
KEYBOARD_KEY_85=unknown # lid close; also reported via special evdev
|
|
KEYBOARD_KEY_f8=wlan # Wireless HW switch button
|