Skip to content

Commit a5e505a

Browse files
committed
Merge tag 'platform-drivers-x86-v6.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform driver fixes from Hans de Goede: "Final set of three small fixes for 6.5" * tag 'platform-drivers-x86-v6.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: platform/mellanox: Fix mlxbf-tmfifo not handling all virtio CONSOLE notifications platform/x86: ideapad-laptop: Add support for new hotkeys found on ThinkBook 14s Yoga ITL platform/x86: lenovo-ymc: Add Lenovo Yoga 7 14ACN6 to ec_trigger_quirk_dmi_table
2 parents 89bf620 + 0848cab commit a5e505a

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

drivers/platform/mellanox/mlxbf-tmfifo.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,7 @@ static bool mlxbf_tmfifo_virtio_notify(struct virtqueue *vq)
887887
tm_vdev = fifo->vdev[VIRTIO_ID_CONSOLE];
888888
mlxbf_tmfifo_console_output(tm_vdev, vring);
889889
spin_unlock_irqrestore(&fifo->spin_lock[0], flags);
890+
set_bit(MLXBF_TM_TX_LWM_IRQ, &fifo->pend_events);
890891
} else if (test_and_set_bit(MLXBF_TM_TX_LWM_IRQ,
891892
&fifo->pend_events)) {
892893
return true;

drivers/platform/x86/ideapad-laptop.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,6 +1049,11 @@ static const struct key_entry ideapad_keymap[] = {
10491049
{ KE_IGNORE, 0x03 | IDEAPAD_WMI_KEY },
10501050
/* Customizable Lenovo Hotkey ("star" with 'S' inside) */
10511051
{ KE_KEY, 0x01 | IDEAPAD_WMI_KEY, { KEY_FAVORITES } },
1052+
{ KE_KEY, 0x04 | IDEAPAD_WMI_KEY, { KEY_SELECTIVE_SCREENSHOT } },
1053+
/* Lenovo Support */
1054+
{ KE_KEY, 0x07 | IDEAPAD_WMI_KEY, { KEY_HELP } },
1055+
{ KE_KEY, 0x0e | IDEAPAD_WMI_KEY, { KEY_PICKUP_PHONE } },
1056+
{ KE_KEY, 0x0f | IDEAPAD_WMI_KEY, { KEY_HANGUP_PHONE } },
10521057
/* Dark mode toggle */
10531058
{ KE_KEY, 0x13 | IDEAPAD_WMI_KEY, { KEY_PROG1 } },
10541059
/* Sound profile switch */

drivers/platform/x86/lenovo-ymc.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ static const struct dmi_system_id ec_trigger_quirk_dmi_table[] = {
3636
DMI_MATCH(DMI_PRODUCT_NAME, "82QF"),
3737
},
3838
},
39+
{
40+
/* Lenovo Yoga 7 14ACN6 */
41+
.matches = {
42+
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
43+
DMI_MATCH(DMI_PRODUCT_NAME, "82N7"),
44+
},
45+
},
3946
{ }
4047
};
4148

0 commit comments

Comments
 (0)