Commit 2ca4fec1 authored Jan 29, 2020 by Mansour Behabadi Committed by Greg Kroah-Hartman Mar 20, 2020

HID: apple: Add support for recent firmware on Magic Keyboards



[ Upstream commit e433be929e63265b7412478eb7ff271467aee2d7 ]

Magic Keyboards with more recent firmware (0x0100) report Fn key differently.
Without this patch, Fn key may not behave as expected and may not be
configurable via hid_apple fnmode module parameter.

Signed-off-by: Mansour Behabadi <mansour@oxplot.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent e8faa2c4

drivers/hid/hid-apple.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -343,7 +343,8 @@ static int apple_input_mapping(struct hid_device hdev, struct hid_input hi,
		unsigned long *bit, int max)
		{
		if (usage->hid == (HID_UP_CUSTOM \| 0x0003) \|\|
		usage->hid == (HID_UP_MSVENDOR \| 0x0003)) {
		usage->hid == (HID_UP_MSVENDOR \| 0x0003) \|\|
		usage->hid == (HID_UP_HPVENDOR2 \| 0x0003)) {
		/* The fn key on Apple USB keyboards */
		set_bit(EV_REP, hi->input->evbit);
		hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN);