From fbf377979f2865be9688522b09cf8c613c7b0d35 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 5 Jul 2023 10:28:42 +0900 Subject: [PATCH] hwdb: merge multiple keyboard entries with same setting Follow-up for 123c0e24dd3af4c7168ee77dad841cc730b5db60. Note, the entry was originally added for IdeaPad Flex 5 in 21b589a15504cdbd309a82abb566ef4e36957f92. Then, a bug introduced by 19db450f3a243fcaf0949beebafc3025f8e3a98e. But, when it was fixed by 738a195bd59dc2e85c15382d17d391c1781aaa4e, the glob becomes too stricter, and another variant was added by 123c0e24dd3af4c7168ee77dad841cc730b5db60. (cherry picked from commit 65d7d832a9faa462ccd18b84ec42b3794a37517d) Related: RHEL-5950 --- hwdb.d/60-keyboard.hwdb | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb index ce52a3d47d..f3f40ef2ff 100644 --- a/hwdb.d/60-keyboard.hwdb +++ b/hwdb.d/60-keyboard.hwdb @@ -1010,16 +1010,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO*:pn*IdeaPad*U300s*:pvr* KEYBOARD_KEY_ce=f20 # micmute evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO*:pn*IdeaPad*Z370*:pvr* - KEYBOARD_KEY_a0=!mute - KEYBOARD_KEY_ae=!volumedown - KEYBOARD_KEY_b0=!volumeup - -evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO:*:pvrIdeaPadFlex514IIL05:* - KEYBOARD_KEY_a0=!mute - KEYBOARD_KEY_ae=!volumedown - KEYBOARD_KEY_b0=!volumeup - -evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO:*:pvrIdeaPadFlex514ARE05:* +# Lenovo IdeaPad Flex 5 +evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO:*:pvrIdeaPadFlex5* +# Lenovo Yoga S940 (9th gen) +evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO:pn81Q7*:pvrLenovoYogaS940:* KEYBOARD_KEY_a0=!mute KEYBOARD_KEY_ae=!volumedown KEYBOARD_KEY_b0=!volumeup @@ -1028,15 +1022,6 @@ evdev:atkbd:dmi:*:svnLENOVO:*:pvrLenovoYoga300-11IBR:* KEYBOARD_KEY_62=unknown # Touchpad on, also emitted by "Ideapad extra buttons", ignore KEYBOARD_KEY_63=unknown # Touchpad off, also emitted by "Ideapad extra buttons", ignore -# Fix for volume keys on Lenovo Yoga S940 -# For 10th gen it should be pn81Q8 instead of pn81Q7 but -# I don't have a device to test -# perhaps pn81Q* would work for both generations -evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO:pn81Q7*:pvrLenovoYogaS940:* - KEYBOARD_KEY_a0=!mute - KEYBOARD_KEY_ae=!volumedown - KEYBOARD_KEY_b0=!volumeup - # Lenovo Y50-70 evdev:atkbd:dmi:bvn*:bvr*:svnLENOVO*:pn*20378*:pvr* KEYBOARD_KEY_f3=f21 # Fn+F6 (toggle touchpad)