mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-29 12:55:24 -04:00
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
This commit is contained in:
@@ -887,6 +887,7 @@ static bool mlxbf_tmfifo_virtio_notify(struct virtqueue *vq)
|
||||
tm_vdev = fifo->vdev[VIRTIO_ID_CONSOLE];
|
||||
mlxbf_tmfifo_console_output(tm_vdev, vring);
|
||||
spin_unlock_irqrestore(&fifo->spin_lock[0], flags);
|
||||
set_bit(MLXBF_TM_TX_LWM_IRQ, &fifo->pend_events);
|
||||
} else if (test_and_set_bit(MLXBF_TM_TX_LWM_IRQ,
|
||||
&fifo->pend_events)) {
|
||||
return true;
|
||||
|
||||
@@ -1049,6 +1049,11 @@ static const struct key_entry ideapad_keymap[] = {
|
||||
{ KE_IGNORE, 0x03 | IDEAPAD_WMI_KEY },
|
||||
/* Customizable Lenovo Hotkey ("star" with 'S' inside) */
|
||||
{ KE_KEY, 0x01 | IDEAPAD_WMI_KEY, { KEY_FAVORITES } },
|
||||
{ KE_KEY, 0x04 | IDEAPAD_WMI_KEY, { KEY_SELECTIVE_SCREENSHOT } },
|
||||
/* Lenovo Support */
|
||||
{ KE_KEY, 0x07 | IDEAPAD_WMI_KEY, { KEY_HELP } },
|
||||
{ KE_KEY, 0x0e | IDEAPAD_WMI_KEY, { KEY_PICKUP_PHONE } },
|
||||
{ KE_KEY, 0x0f | IDEAPAD_WMI_KEY, { KEY_HANGUP_PHONE } },
|
||||
/* Dark mode toggle */
|
||||
{ KE_KEY, 0x13 | IDEAPAD_WMI_KEY, { KEY_PROG1 } },
|
||||
/* Sound profile switch */
|
||||
|
||||
@@ -36,6 +36,13 @@ static const struct dmi_system_id ec_trigger_quirk_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "82QF"),
|
||||
},
|
||||
},
|
||||
{
|
||||
/* Lenovo Yoga 7 14ACN6 */
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "82N7"),
|
||||
},
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user