summaryrefslogtreecommitdiff
path: root/src/acpi
diff options
context:
space:
mode:
authorAseda Aboagye <aaboagye@google.com>2024-03-20 21:14:08 -0500
committerFelix Held <felix-coreboot@felixheld.de>2024-04-22 14:05:42 +0000
commitb55000b2d5975f2355936c99b5b732ae4b9da3d3 (patch)
tree0f5be63b3b5981d468c0414aff3d8e9cc920ebfa /src/acpi
parent101685de0c1a61f8940d007abcacfa5cc4291791 (diff)
acpigen_ps2_keybd: Add assistant key to linux,keymap
If the ChromiumOS EC indicates that the device has an assistant key, we should also add it to the generated linux,keymap binding. This commit simply does so by examining the keyboard capabilities reported by the EC. BUG=b:333088656 TEST=With a device that has an assistant key, flash AP FW and verify that the key is mapped to `KEY_ASSISTANT` in the Linux kernel using `evtest`. Change-Id: I217220e89bce88e3045a4fc3b124954696276442 Signed-off-by: Aseda Aboagye <aaboagye@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81996 Reviewed-by: Jonathon Hall <jonathon.hall@puri.sm> Reviewed-by: Paul Menzel <paulepanter@mailbox.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Caveh Jalali <caveh@chromium.org>
Diffstat (limited to 'src/acpi')
-rw-r--r--src/acpi/acpigen_ps2_keybd.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/acpi/acpigen_ps2_keybd.c b/src/acpi/acpigen_ps2_keybd.c
index cc21d5df5a..4a05225d6f 100644
--- a/src/acpi/acpigen_ps2_keybd.c
+++ b/src/acpi/acpigen_ps2_keybd.c
@@ -211,6 +211,7 @@ static void ssdt_generate_keymap(struct acpi_dp *dp, uint8_t num_top_row_keys,
bool can_send_function_keys,
bool has_numeric_keypad,
bool has_scrnlock_key,
+ bool has_assistant_key,
bool has_alpha_num_punct_keys)
{
struct acpi_dp *dp_array;
@@ -270,6 +271,12 @@ static void ssdt_generate_keymap(struct acpi_dp *dp, uint8_t num_top_row_keys,
total++;
}
+ /* Add the keymap for the assistant key if present */
+ if (has_assistant_key) {
+ acpi_dp_add_integer(dp_array, NULL, KEYMAP(0x5c, KEY_ASSISTANT));
+ total++;
+ }
+
/* Provide alphanumeric and punctuation keys (rest of the keyboard) if
* present
*/
@@ -291,6 +298,7 @@ void acpigen_ps2_keyboard_dsd(const char *scope, uint8_t num_top_row_keys,
bool can_send_function_keys,
bool has_numeric_keypad,
bool has_scrnlock_key,
+ bool has_assistant_key,
bool has_alpha_num_punct_keys)
{
struct acpi_dp *dsd;
@@ -312,7 +320,8 @@ void acpigen_ps2_keyboard_dsd(const char *scope, uint8_t num_top_row_keys,
ssdt_generate_physmap(dsd, num_top_row_keys, action_keys);
ssdt_generate_keymap(dsd, num_top_row_keys, action_keys,
can_send_function_keys, has_numeric_keypad,
- has_scrnlock_key, has_alpha_num_punct_keys);
+ has_scrnlock_key, has_assistant_key,
+ has_alpha_num_punct_keys);
acpi_dp_write(dsd);
acpigen_pop_len(); /* Scope */
}