Commit b9865081 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.16/apple' into for-linus 

- support for 2021 Magic Keyboard (Alex Henrie)
- tidle key quirk handling improvement (Alex Henrie)
parents a6e757e3 d58cf34a

drivers/hid/hid-apple.c

+33 −33
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
#define APPLE_RDESC_JIS		0x0001

#define APPLE_IGNORE_MOUSE	0x0002

#define APPLE_HAS_FN		0x0004

#define APPLE_HIDDEV		0x0008

/* 0x0010 reserved, was: APPLE_ISO_KEYBOARD */

/* 0x0008 reserved, was: APPLE_HIDDEV */

#define APPLE_ISO_TILDE_QUIRK	0x0010

#define APPLE_MIGHTYMOUSE	0x0020

#define APPLE_INVERT_HWHEEL	0x0040

#define APPLE_IGNORE_HIDINPUT	0x0080

/* 0x0080 reserved, was: APPLE_IGNORE_HIDINPUT */

#define APPLE_NUMLOCK_EMULATION	0x0100



#define APPLE_FLAG_FKEY		0x01
@@ -40,10 +40,10 @@ module_param(fnmode, uint, 0644); 
MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "

		"[1] = fkeyslast, 2 = fkeysfirst)");



static unsigned int iso_layout = 1;

module_param(iso_layout, uint, 0644);

MODULE_PARM_DESC(iso_layout, "Enable/Disable hardcoded ISO-layout of the keyboard. "

		"(0 = disabled, [1] = enabled)");

static int iso_layout = -1;

module_param(iso_layout, int, 0644);

MODULE_PARM_DESC(iso_layout, "Swap the backtick/tilde and greater-than/less-than keys. "

		"([-1] = auto, 0 = disabled, 1 = enabled)");



static unsigned int swap_opt_cmd;

module_param(swap_opt_cmd, uint, 0644);
@@ -277,8 +277,8 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		}

	}



	if (iso_layout) {

		if (hid->country == HID_COUNTRY_INTERNATIONAL_ISO) {

	if (iso_layout > 0 || (iso_layout < 0 && (asc->quirks & APPLE_ISO_TILDE_QUIRK) &&

			hid->country == HID_COUNTRY_INTERNATIONAL_ISO)) {

		trans = apple_find_translation(apple_iso_keyboard, usage->code);

		if (trans) {

			input_event_with_scancode(input, usage->type,
@@ -286,7 +286,6 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
			return 1;

		}

	}

	}



	if (swap_opt_cmd) {

		trans = apple_find_translation(swapped_option_cmd_keys, usage->code);
@@ -440,7 +439,6 @@ static int apple_probe(struct hid_device *hdev, 
{

	unsigned long quirks = id->driver_data;

	struct apple_sc *asc;

	unsigned int connect_mask = HID_CONNECT_DEFAULT;

	int ret;



	asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
@@ -459,12 +457,7 @@ static int apple_probe(struct hid_device *hdev, 
		return ret;

	}



	if (quirks & APPLE_HIDDEV)

		connect_mask |= HID_CONNECT_HIDDEV_FORCE;

	if (quirks & APPLE_IGNORE_HIDINPUT)

		connect_mask &= ~HID_CONNECT_HIDINPUT;



	ret = hid_hw_start(hdev, connect_mask);

	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret) {

		hid_err(hdev, "hw start failed\n");

		return ret;
@@ -533,9 +526,11 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_ISO_TILDE_QUIRK },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_ISO_TILDE_QUIRK },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

				USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
@@ -544,14 +539,14 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
@@ -633,13 +628,18 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_ISO_TILDE_QUIRK },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },

	{ HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_TILDE_QUIRK },



	{ }

};

drivers/hid/hid-ids.h

+3 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ 
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI  0x0255

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS   0x0257

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI   0x0267

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_ANSI   0x026c

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015   0x0267

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015   0x026c

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI	0x0290

#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO	0x0291

#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS	0x0292
@@ -174,6 +174,7 @@ 
#define USB_DEVICE_ID_APPLE_IRCONTROL3	0x8241

#define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242

#define USB_DEVICE_ID_APPLE_IRCONTROL5	0x8243

#define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021   0x029c



#define USB_VENDOR_ID_ASUS		0x0486

#define USB_DEVICE_ID_ASUS_T91MT	0x0185

drivers/hid/hid-quirks.c

+2 −1
Original line number Diff line number Diff line
@@ -299,9 +299,10 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) },

#endif

#if IS_ENABLED(CONFIG_HID_APPLEIR)

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },